@@ -143,7 +143,7 @@ var queries = []queryTest{
143
143
},
144
144
{
145
145
"SELECT i FROM mytable WHERE 'hello';" ,
146
- []sql. Row {} ,
146
+ nil ,
147
147
},
148
148
{
149
149
"SELECT i FROM mytable WHERE not 'hello';" ,
@@ -637,7 +637,7 @@ var queries = []queryTest{
637
637
},
638
638
{
639
639
"SELECT * FROM mytable WHERE 1 > 5" ,
640
- []sql. Row {} ,
640
+ nil ,
641
641
},
642
642
{
643
643
"SELECT SUM(i) + 1, i FROM mytable GROUP BY i ORDER BY i" ,
@@ -665,7 +665,7 @@ var queries = []queryTest{
665
665
},
666
666
{
667
667
`/*!40101 SET NAMES utf8 */` ,
668
- []sql. Row {} ,
668
+ nil ,
669
669
},
670
670
{
671
671
`SHOW DATABASES` ,
@@ -822,15 +822,15 @@ var queries = []queryTest{
822
822
`
823
823
SHOW WARNINGS
824
824
` ,
825
- []sql. Row {} ,
825
+ nil ,
826
826
},
827
827
{
828
828
`SHOW WARNINGS LIMIT 0` ,
829
- []sql. Row {} ,
829
+ nil ,
830
830
},
831
831
{
832
832
`SET SESSION NET_READ_TIMEOUT= 700, SESSION NET_WRITE_TIMEOUT= 700` ,
833
- []sql. Row {} ,
833
+ nil ,
834
834
},
835
835
{
836
836
`SELECT NULL` ,
@@ -898,6 +898,30 @@ var queries = []queryTest{
898
898
{int8 (123 )},
899
899
},
900
900
},
901
+ {
902
+ "SELECT i FROM mytable where NULL > 10;" ,
903
+ nil ,
904
+ },
905
+ {
906
+ "SELECT i FROM mytable where NULL in (10);" ,
907
+ nil ,
908
+ },
909
+ {
910
+ "SELECT i FROM mytable where NULL in (NULL, NULL);" ,
911
+ nil ,
912
+ },
913
+ {
914
+ "SELECT i FROM mytable where NOT NULL NOT IN (NULL);" ,
915
+ nil ,
916
+ },
917
+ {
918
+ "SELECT i FROM mytable where NOT (NULL) <> 10;" ,
919
+ nil ,
920
+ },
921
+ {
922
+ "SELECT i FROM mytable where NOT NULL <> NULL;" ,
923
+ nil ,
924
+ },
901
925
{
902
926
`SELECT round(15728640/1024/1024)` ,
903
927
[]sql.Row {
@@ -940,23 +964,23 @@ var queries = []queryTest{
940
964
},
941
965
{
942
966
`SHOW COLLATION LIKE 'foo'` ,
943
- []sql. Row {} ,
967
+ nil ,
944
968
},
945
969
{
946
970
`SHOW COLLATION LIKE 'utf8%'` ,
947
971
[]sql.Row {{"utf8_bin" , "utf8mb4" , int64 (1 ), "Yes" , "Yes" , int64 (1 )}},
948
972
},
949
973
{
950
974
`SHOW COLLATION WHERE charset = 'foo'` ,
951
- []sql. Row {} ,
975
+ nil ,
952
976
},
953
977
{
954
978
"SHOW COLLATION WHERE `Default` = 'Yes'" ,
955
979
[]sql.Row {{"utf8_bin" , "utf8mb4" , int64 (1 ), "Yes" , "Yes" , int64 (1 )}},
956
980
},
957
981
{
958
982
"ROLLBACK" ,
959
- []sql. Row {} ,
983
+ nil ,
960
984
},
961
985
{
962
986
"SELECT substring(s, 1, 1) FROM mytable ORDER BY substring(s, 1, 1)" ,
@@ -1212,7 +1236,7 @@ var queries = []queryTest{
1212
1236
},
1213
1237
{
1214
1238
`SELECT * FROM mytable WHERE NULL AND i = 3` ,
1215
- []sql. Row {} ,
1239
+ nil ,
1216
1240
},
1217
1241
{
1218
1242
`SELECT 1 FROM mytable GROUP BY i HAVING i > 1` ,
@@ -1284,7 +1308,7 @@ var queries = []queryTest{
1284
1308
},
1285
1309
{
1286
1310
`SELECT EXPLODE(REGEXP_MATCHES("helloworld", "bop"))` ,
1287
- []sql. Row {} ,
1311
+ nil ,
1288
1312
},
1289
1313
{
1290
1314
`SELECT EXPLODE(REGEXP_MATCHES("", ""))` ,
@@ -1578,7 +1602,7 @@ var infoSchemaQueries = []queryTest {
1578
1602
GROUP BY LOGFILE_GROUP_NAME, FILE_NAME, ENGINE, TOTAL_EXTENTS, INITIAL_SIZE
1579
1603
ORDER BY LOGFILE_GROUP_NAME
1580
1604
` ,
1581
- []sql. Row {} ,
1605
+ nil ,
1582
1606
},
1583
1607
{
1584
1608
`
@@ -1588,7 +1612,7 @@ var infoSchemaQueries = []queryTest {
1588
1612
WHERE FILE_TYPE = 'DATAFILE'
1589
1613
ORDER BY TABLESPACE_NAME, LOGFILE_GROUP_NAME
1590
1614
` ,
1591
- []sql. Row {} ,
1615
+ nil ,
1592
1616
},
1593
1617
{
1594
1618
`
@@ -1599,7 +1623,7 @@ var infoSchemaQueries = []queryTest {
1599
1623
WHERE SCHEMA_NAME = 'mydb'
1600
1624
AND TABLE_NAME = 'mytable'
1601
1625
` ,
1602
- []sql. Row {} ,
1626
+ nil ,
1603
1627
},
1604
1628
{
1605
1629
`
@@ -2071,7 +2095,7 @@ func TestWarnings(t *testing.T) {
2071
2095
`
2072
2096
SHOW WARNINGS LIMIT 10,1
2073
2097
` ,
2074
- []sql. Row {} ,
2098
+ nil ,
2075
2099
},
2076
2100
}
2077
2101
@@ -3265,7 +3289,7 @@ func testQueryWithContext(ctx *sql.Context, t *testing.T, e *sqle.Engine, q stri
3265
3289
require .NoError (err )
3266
3290
3267
3291
// .Equal gives better error messages than .ElementsMatch, so use it when possible
3268
- if orderBy || len (rows ) = = 1 {
3292
+ if orderBy || len (expected ) < = 1 {
3269
3293
require .Equal (expected , rows )
3270
3294
} else {
3271
3295
require .ElementsMatch (expected , rows )
@@ -3814,7 +3838,7 @@ func TestDeleteFrom(t *testing.T) {
3814
3838
"DELETE FROM mytable;" ,
3815
3839
[]sql.Row {{int64 (3 )}},
3816
3840
"SELECT * FROM mytable;" ,
3817
- []sql. Row {} ,
3841
+ nil ,
3818
3842
},
3819
3843
{
3820
3844
"DELETE FROM mytable WHERE i = 2;" ,
@@ -3856,13 +3880,13 @@ func TestDeleteFrom(t *testing.T) {
3856
3880
"DELETE FROM mytable WHERE s <> 'dne';" ,
3857
3881
[]sql.Row {{int64 (3 )}},
3858
3882
"SELECT * FROM mytable;" ,
3859
- []sql. Row {} ,
3883
+ nil ,
3860
3884
},
3861
3885
{
3862
3886
"DELETE FROM mytable WHERE s LIKE '%row';" ,
3863
3887
[]sql.Row {{int64 (3 )}},
3864
3888
"SELECT * FROM mytable;" ,
3865
- []sql. Row {} ,
3889
+ nil ,
3866
3890
},
3867
3891
{
3868
3892
"DELETE FROM mytable WHERE s = 'dne';" ,
0 commit comments