Rewrite tests for automatic generation

Regularize the parquets - nulls and nonulls each come in 3 variants,
with 1, 10 and 99 rows per rowgroup.

All test queries are written against nullsA, no_nullsA.

Next commit will introduce a tool to expand these template queries to
go against the actual tables.

parquet-generator/parquets.py

@@ -136,12 +136,15 @@ def main():
     write_parquet('99-rows-1.parquet', rows, types, row_group_size=99)
     write_csv('no-nulls.csv', rows)
     write_parquet('99-rows-10.parquet', rows, types, row_group_size=10)
+    write_parquet('99-rows-99.parquet', rows, types, row_group_size=1)
 
     for i in range(len(rows)):
         for j in range(len(rows[i])):
             if (i >= 10 and i <= 19) or (i >= 20 and (i + j) % 2 == 0):
                 rows[i][j] = None
-    write_parquet('99-rows-nulls.parquet', rows, types,row_group_size=10)
+    write_parquet('99-rows-nulls-99.parquet', rows, types,row_group_size=99)
+    write_parquet('99-rows-nulls-10.parquet', rows, types,row_group_size=10)
+    write_parquet('99-rows-nulls-1.parquet', rows, types,row_group_size=1)
     write_csv('nulls.csv', rows)
 
     write_unsupported_parquets()

tests/queries/002-table-scan-10-rowgroups.sql

@@ -1,100 +0,0 @@
-SELECT rowid, bool_0, int8_1, int16_2, int32_3, int64_4, datetime(ts_5 / 1000, 'unixepoch'), printf('%.2f', double_6) AS double_6, string_7, string_8, quote(binary_9), quote(binary_10) FROM no_nulls2
-0|1|50|5000|50000000|50000000000|1985-07-20 00:00:00|99.00|0|000|X'00'|X'00'
-1|0|49|4900|49000000|49000000000|1985-07-21 00:00:00|49.50|1|001|X'0101'|X'01'
-2|1|48|4800|48000000|48000000000|1985-07-22 00:00:00|33.00|2|002|X'020202'|X'02'
-3|0|47|4700|47000000|47000000000|1985-07-23 00:00:00|24.75|3|003|X'03030303'|X'03'
-4|1|46|4600|46000000|46000000000|1985-07-24 00:00:00|19.80|4|004|X'0404040404'|X'04'
-5|0|45|4500|45000000|45000000000|1985-07-25 00:00:00|16.50|5|005|X'05'|X'05'
-6|1|44|4400|44000000|44000000000|1985-07-26 00:00:00|14.14|6|006|X'0606'|X'06'
-7|0|43|4300|43000000|43000000000|1985-07-27 00:00:00|12.38|7|007|X'070707'|X'07'
-8|1|42|4200|42000000|42000000000|1985-07-28 00:00:00|11.00|8|008|X'08080808'|X'08'
-9|0|41|4100|41000000|41000000000|1985-07-29 00:00:00|9.90|9|009|X'0909090909'|X'09'
-10|1|40|4000|40000000|40000000000|1985-07-30 00:00:00|9.00|10|010|X'0A'|X'0A'
-11|0|39|3900|39000000|39000000000|1985-07-31 00:00:00|8.25|11|011|X'0B0B'|X'0B'
-12|1|38|3800|38000000|38000000000|1985-08-01 00:00:00|7.62|12|012|X'0C0C0C'|X'0C'
-13|0|37|3700|37000000|37000000000|1985-08-02 00:00:00|7.07|13|013|X'0D0D0D0D'|X'0D'
-14|1|36|3600|36000000|36000000000|1985-08-03 00:00:00|6.60|14|014|X'0E0E0E0E0E'|X'0E'
-15|0|35|3500|35000000|35000000000|1985-08-04 00:00:00|6.19|15|015|X'0F'|X'0F'
-16|1|34|3400|34000000|34000000000|1985-08-05 00:00:00|5.82|16|016|X'1010'|X'10'
-17|0|33|3300|33000000|33000000000|1985-08-06 00:00:00|5.50|17|017|X'111111'|X'11'
-18|1|32|3200|32000000|32000000000|1985-08-07 00:00:00|5.21|18|018|X'12121212'|X'12'
-19|0|31|3100|31000000|31000000000|1985-08-08 00:00:00|4.95|19|019|X'1313131313'|X'13'
-20|1|30|3000|30000000|30000000000|1985-08-09 00:00:00|4.71|20|020|X'14'|X'14'
-21|0|29|2900|29000000|29000000000|1985-08-10 00:00:00|4.50|21|021|X'1515'|X'15'
-22|1|28|2800|28000000|28000000000|1985-08-11 00:00:00|4.30|22|022|X'161616'|X'16'
-23|0|27|2700|27000000|27000000000|1985-08-12 00:00:00|4.13|23|023|X'17171717'|X'17'
-24|1|26|2600|26000000|26000000000|1985-08-13 00:00:00|3.96|24|024|X'1818181818'|X'18'
-25|0|25|2500|25000000|25000000000|1985-08-14 00:00:00|3.81|25|025|X'19'|X'19'
-26|1|24|2400|24000000|24000000000|1985-08-15 00:00:00|3.67|26|026|X'1A1A'|X'1A'
-27|0|23|2300|23000000|23000000000|1985-08-16 00:00:00|3.54|27|027|X'1B1B1B'|X'1B'
-28|1|22|2200|22000000|22000000000|1985-08-17 00:00:00|3.41|28|028|X'1C1C1C1C'|X'1C'
-29|0|21|2100|21000000|21000000000|1985-08-18 00:00:00|3.30|29|029|X'1D1D1D1D1D'|X'1D'
-30|1|20|2000|20000000|20000000000|1985-08-19 00:00:00|3.19|30|030|X'1E'|X'1E'
-31|0|19|1900|19000000|19000000000|1985-08-20 00:00:00|3.09|31|031|X'1F1F'|X'1F'
-32|1|18|1800|18000000|18000000000|1985-08-21 00:00:00|3.00|32|032|X'202020'|X'20'
-33|0|17|1700|17000000|17000000000|1985-08-22 00:00:00|2.91|33|033|X'21212121'|X'21'
-34|1|16|1600|16000000|16000000000|1985-08-23 00:00:00|2.83|34|034|X'2222222222'|X'22'
-35|0|15|1500|15000000|15000000000|1985-08-24 00:00:00|2.75|35|035|X'23'|X'23'
-36|1|14|1400|14000000|14000000000|1985-08-25 00:00:00|2.68|36|036|X'2424'|X'24'
-37|0|13|1300|13000000|13000000000|1985-08-26 00:00:00|2.61|37|037|X'252525'|X'25'
-38|1|12|1200|12000000|12000000000|1985-08-27 00:00:00|2.54|38|038|X'26262626'|X'26'
-39|0|11|1100|11000000|11000000000|1985-08-28 00:00:00|2.48|39|039|X'2727272727'|X'27'
-40|1|10|1000|10000000|10000000000|1985-08-29 00:00:00|2.41|40|040|X'28'|X'28'
-41|0|9|900|9000000|9000000000|1985-08-30 00:00:00|2.36|41|041|X'2929'|X'29'
-42|1|8|800|8000000|8000000000|1985-08-31 00:00:00|2.30|42|042|X'2A2A2A'|X'2A'
-43|0|7|700|7000000|7000000000|1985-09-01 00:00:00|2.25|43|043|X'2B2B2B2B'|X'2B'
-44|1|6|600|6000000|6000000000|1985-09-02 00:00:00|2.20|44|044|X'2C2C2C2C2C'|X'2C'
-45|0|5|500|5000000|5000000000|1985-09-03 00:00:00|2.15|45|045|X'2D'|X'2D'
-46|1|4|400|4000000|4000000000|1985-09-04 00:00:00|2.11|46|046|X'2E2E'|X'2E'
-47|0|3|300|3000000|3000000000|1985-09-05 00:00:00|2.06|47|047|X'2F2F2F'|X'2F'
-48|1|2|200|2000000|2000000000|1985-09-06 00:00:00|2.02|48|048|X'30303030'|X'30'
-49|0|1|100|1000000|1000000000|1985-09-07 00:00:00|1.98|49|049|X'3131313131'|X'31'
-50|1|0|0|0|0|1985-09-08 00:00:00|1.94|50|050|X'32'|X'32'
-51|0|-1|-100|-1000000|-1000000000|1985-09-09 00:00:00|1.90|51|051|X'3333'|X'33'
-52|1|-2|-200|-2000000|-2000000000|1985-09-10 00:00:00|1.87|52|052|X'343434'|X'34'
-53|0|-3|-300|-3000000|-3000000000|1985-09-11 00:00:00|1.83|53|053|X'35353535'|X'35'
-54|1|-4|-400|-4000000|-4000000000|1985-09-12 00:00:00|1.80|54|054|X'3636363636'|X'36'
-55|0|-5|-500|-5000000|-5000000000|1985-09-13 00:00:00|1.77|55|055|X'37'|X'37'
-56|1|-6|-600|-6000000|-6000000000|1985-09-14 00:00:00|1.74|56|056|X'3838'|X'38'
-57|0|-7|-700|-7000000|-7000000000|1985-09-15 00:00:00|1.71|57|057|X'393939'|X'39'
-58|1|-8|-800|-8000000|-8000000000|1985-09-16 00:00:00|1.68|58|058|X'3A3A3A3A'|X'3A'
-59|0|-9|-900|-9000000|-9000000000|1985-09-17 00:00:00|1.65|59|059|X'3B3B3B3B3B'|X'3B'
-60|1|-10|-1000|-10000000|-10000000000|1985-09-18 00:00:00|1.62|60|060|X'3C'|X'3C'
-61|0|-11|-1100|-11000000|-11000000000|1985-09-19 00:00:00|1.60|61|061|X'3D3D'|X'3D'
-62|1|-12|-1200|-12000000|-12000000000|1985-09-20 00:00:00|1.57|62|062|X'3E3E3E'|X'3E'
-63|0|-13|-1300|-13000000|-13000000000|1985-09-21 00:00:00|1.55|63|063|X'3F3F3F3F'|X'3F'
-64|1|-14|-1400|-14000000|-14000000000|1985-09-22 00:00:00|1.52|64|064|X'4040404040'|X'40'
-65|0|-15|-1500|-15000000|-15000000000|1985-09-23 00:00:00|1.50|65|065|X'41'|X'41'
-66|1|-16|-1600|-16000000|-16000000000|1985-09-24 00:00:00|1.48|66|066|X'4242'|X'42'
-67|0|-17|-1700|-17000000|-17000000000|1985-09-25 00:00:00|1.46|67|067|X'434343'|X'43'
-68|1|-18|-1800|-18000000|-18000000000|1985-09-26 00:00:00|1.43|68|068|X'44444444'|X'44'
-69|0|-19|-1900|-19000000|-19000000000|1985-09-27 00:00:00|1.41|69|069|X'4545454545'|X'45'
-70|1|-20|-2000|-20000000|-20000000000|1985-09-28 00:00:00|1.39|70|070|X'46'|X'46'
-71|0|-21|-2100|-21000000|-21000000000|1985-09-29 00:00:00|1.38|71|071|X'4747'|X'47'
-72|1|-22|-2200|-22000000|-22000000000|1985-09-30 00:00:00|1.36|72|072|X'484848'|X'48'
-73|0|-23|-2300|-23000000|-23000000000|1985-10-01 00:00:00|1.34|73|073|X'49494949'|X'49'
-74|1|-24|-2400|-24000000|-24000000000|1985-10-02 00:00:00|1.32|74|074|X'4A4A4A4A4A'|X'4A'
-75|0|-25|-2500|-25000000|-25000000000|1985-10-03 00:00:00|1.30|75|075|X'4B'|X'4B'
-76|1|-26|-2600|-26000000|-26000000000|1985-10-04 00:00:00|1.29|76|076|X'4C4C'|X'4C'
-77|0|-27|-2700|-27000000|-27000000000|1985-10-05 00:00:00|1.27|77|077|X'4D4D4D'|X'4D'
-78|1|-28|-2800|-28000000|-28000000000|1985-10-06 00:00:00|1.25|78|078|X'4E4E4E4E'|X'4E'
-79|0|-29|-2900|-29000000|-29000000000|1985-10-07 00:00:00|1.24|79|079|X'4F4F4F4F4F'|X'4F'
-80|1|-30|-3000|-30000000|-30000000000|1985-10-08 00:00:00|1.22|80|080|X'50'|X'50'
-81|0|-31|-3100|-31000000|-31000000000|1985-10-09 00:00:00|1.21|81|081|X'5151'|X'51'
-82|1|-32|-3200|-32000000|-32000000000|1985-10-10 00:00:00|1.19|82|082|X'525252'|X'52'
-83|0|-33|-3300|-33000000|-33000000000|1985-10-11 00:00:00|1.18|83|083|X'53535353'|X'53'
-84|1|-34|-3400|-34000000|-34000000000|1985-10-12 00:00:00|1.16|84|084|X'5454545454'|X'54'
-85|0|-35|-3500|-35000000|-35000000000|1985-10-13 00:00:00|1.15|85|085|X'55'|X'55'
-86|1|-36|-3600|-36000000|-36000000000|1985-10-14 00:00:00|1.14|86|086|X'5656'|X'56'
-87|0|-37|-3700|-37000000|-37000000000|1985-10-15 00:00:00|1.13|87|087|X'575757'|X'57'
-88|1|-38|-3800|-38000000|-38000000000|1985-10-16 00:00:00|1.11|88|088|X'58585858'|X'58'
-89|0|-39|-3900|-39000000|-39000000000|1985-10-17 00:00:00|1.10|89|089|X'5959595959'|X'59'
-90|1|-40|-4000|-40000000|-40000000000|1985-10-18 00:00:00|1.09|90|090|X'5A'|X'5A'
-91|0|-41|-4100|-41000000|-41000000000|1985-10-19 00:00:00|1.08|91|091|X'5B5B'|X'5B'
-92|1|-42|-4200|-42000000|-42000000000|1985-10-20 00:00:00|1.06|92|092|X'5C5C5C'|X'5C'
-93|0|-43|-4300|-43000000|-43000000000|1985-10-21 00:00:00|1.05|93|093|X'5D5D5D5D'|X'5D'
-94|1|-44|-4400|-44000000|-44000000000|1985-10-22 00:00:00|1.04|94|094|X'5E5E5E5E5E'|X'5E'
-95|0|-45|-4500|-45000000|-45000000000|1985-10-23 00:00:00|1.03|95|095|X'5F'|X'5F'
-96|1|-46|-4600|-46000000|-46000000000|1985-10-24 00:00:00|1.02|96|096|X'6060'|X'60'
-97|0|-47|-4700|-47000000|-47000000000|1985-10-25 00:00:00|1.01|97|097|X'616161'|X'61'
-98|1|-48|-4800|-48000000|-48000000000|1985-10-26 00:00:00|1.00|98|098|X'62626262'|X'62'

tests/queries/004-cross-join-10-rowgroups.sql

@@ -1,2 +1,2 @@
-select count(*) from (select * from no_nulls2 t1, no_nulls2 t2);
+select count(*) from (select * from no_nulls1 t1, no_nulls2 t2);
 9801

tests/queries/006-rowid-10-rowgroups.sql

@@ -1,2 +0,0 @@
-select int8_1 from no_nulls2 where rowid = 50;
-0

tests/queries/007-rowid-55-10-rowgroups.sql

@@ -1,2 +1,2 @@
-select int8_1 from no_nulls2 where rowid = 55;
+select int8_1 from no_nulls1 where rowid = 55;
 -5

tests/queries/008-nulls.sql

@@ -1,2 +1,2 @@
-SELECT SUM(CASE WHEN bool_0 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int8_1 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int16_2 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int32_3 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int64_4 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN ts_5 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN double_6 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_7 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_8 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_9 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_10 IS NULL THEN 1 ELSE 0 END) from nulls;
+SELECT SUM(CASE WHEN bool_0 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int8_1 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int16_2 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int32_3 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN int64_4 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN ts_5 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN double_6 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_7 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN string_8 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_9 IS NULL THEN 1 ELSE 0 END), SUM(CASE WHEN binary_10 IS NULL THEN 1 ELSE 0 END) from nulls1;
 50|49|50|49|50|49|50|49|50|49|50

tests/queries/009-rowid-group-by.sql

@@ -1,4 +1,4 @@
-select rowid % 10, count(*) from nulls group by 1 order by 1
+select rowid % 10, count(*) from nulls1 group by 1 order by 1
 0|10
 1|10
 2|10

tests/queries/012-string-7-is-null.sql

@@ -1,4 +1,4 @@
-select rowid, bool_0, quote(binary_10) from nulls where string_7 is null
+select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is null
 10||NULL
 11||NULL
 12||NULL

tests/queries/013-string-7-is-not-null.sql

@@ -1,4 +1,4 @@
-select rowid, bool_0, quote(binary_10) from nulls where string_7 is not null
+select rowid, bool_0, quote(binary_10) from nulls1 where string_7 is not null
 0|1|X'00'
 1|0|X'01'
 2|1|X'02'

tests/queries/014-nulls-like-percent-start.sql

@@ -1,2 +1,2 @@
-select string_7, string_8 from nulls where string_8 like '%0'
+select string_7, string_8 from nulls1 where string_8 like '%0'
 0|000

tests/queries/015-nulls-like-no-match.sql

@@ -1 +1 @@
-select string_7, string_8 from nulls where string_8 like '0'
+select string_7, string_8 from nulls1 where string_8 like '0'

tests/queries/016-nulls-like-percent-end.sql

@@ -1,4 +1,4 @@
-select string_7, string_8 from nulls where string_8 like '0%'
+select string_7, string_8 from nulls1 where string_8 like '0%'
 0|000
 1|001
 2|002

tests/queries/017-nulls-like-underscore.sql

@@ -1,2 +1,2 @@
-select string_7, string_8 from nulls where string_8 like '0_0'
+select string_7, string_8 from nulls1 where string_8 like '0_0'
 0|000

tests/queries/018-string-gt-lt.sql

@@ -1,3 +1,3 @@
-select string_8 from nulls where string_8 > '010' and string_8 < '024'
+select string_8 from nulls1 where string_8 > '010' and string_8 < '024'
 021
 023

tests/queries/019-string-gte-lte.sql

@@ -1,2 +1,2 @@
-select string_8 from nulls where string_8 >= '021' and string_8 <= '021'
+select string_8 from nulls1 where string_8 >= '021' and string_8 <= '021'
 021

tests/queries/020-string-eq.sql

@@ -1,2 +1,2 @@
-select string_8 from nulls where string_8 = '021'
+select string_8 from nulls1 where string_8 = '021'
 021

tests/queries/021-rowid-and-field-eq.sql

@@ -1,2 +1,2 @@
-select string_8 from nulls where rowid = 21 and string_8 = '021'
+select string_8 from nulls1 where rowid = 21 and string_8 = '021'
 021

tests/queries/022-rowid-and-field-ne.sql

@@ -1 +1 @@
-select string_8 from nulls where rowid = 21 and string_8 <> '021'
+select string_8 from nulls1 where rowid = 21 and string_8 <> '021'

tests/queries/023-int8-eq.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 = 30
+select int8_1 from nulls1 where int8_1 = 30
 30

tests/queries/024-int8-lt.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 < -46
+select int8_1 from nulls1 where int8_1 < -46
 -48

tests/queries/025-int8-lte.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 <= -46
+select int8_1 from nulls1 where int8_1 <= -46
 -46
 -48

tests/queries/026-int8-gt.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 > 49
+select int8_1 from nulls1 where int8_1 > 49
 50

tests/queries/027-int8-gte.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 >= 49
+select int8_1 from nulls1 where int8_1 >= 49
 50
 49

tests/queries/028-int8-rowid-eq-and-field-ne.sql

@@ -1 +1 @@
-select int8_1 from nulls where rowid = 66 and int8_1 <> -16
+select int8_1 from nulls1 where rowid = 66 and int8_1 <> -16

tests/queries/029-int64-gte.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 >= 49000000000
+select int64_4 from nulls1 where int64_4 >= 49000000000
 50000000000
 49000000000

tests/queries/030-int64-gt.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 > 49000000000
+select int64_4 from nulls1 where int64_4 > 49000000000
 50000000000

tests/queries/031-int64-eq.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 = 49000000000
+select int64_4 from nulls1 where int64_4 = 49000000000
 49000000000

tests/queries/032-int64-lt.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 < -46000000000
+select int64_4 from nulls1 where int64_4 < -46000000000
 -47000000000

tests/queries/033-int64-lte.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 <= -45000000000
+select int64_4 from nulls1 where int64_4 <= -45000000000
 -45000000000
 -47000000000

tests/queries/034-int64-rowid-eq-and-field-ne.sql

@@ -1 +1 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> -7000000000
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> -7000000000

tests/queries/035-int64-rowid-eq-and-field-ne2.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> -8000000000
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> -8000000000
 -7000000000

tests/queries/036-double-eq.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 = 99.0
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = 99.0
 99.00

tests/queries/037-double-gt.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 > 98.0
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > 98.0
 99.00

tests/queries/038-double-gte.sql

@@ -1,3 +1,3 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 >= 49.5
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= 49.5
 99.00
 49.50

tests/queries/039-double-lt.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 < 99.0 order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 < 99.0 order by double_6 desc limit 1
 49.50

tests/queries/040-double-lte.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 <= 99.0 order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 <= 99.0 order by double_6 desc limit 1
 99.00

tests/queries/041-double-rowid-and-field-ne.sql

@@ -1 +1 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> 99.0
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 99.0

tests/queries/042-double-rowid-and-field-ne2.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> 100.0
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 100.0
 99.00

tests/queries/043-binary-eq.sql

@@ -1,2 +1,2 @@
-select rowid from nulls where binary_10 = x'01';
+select rowid from nulls1 where binary_10 = x'01';
 1

tests/queries/044-binary-rowid-and-ne.sql

@@ -1 +1 @@
-select rowid from nulls where rowid = 1 and binary_10 <> x'01';
+select rowid from nulls1 where rowid = 1 and binary_10 <> x'01';

tests/queries/045-binary-lt.sql

@@ -1,2 +1,2 @@
-select rowid from nulls where binary_10 < x'01';
+select rowid from nulls1 where binary_10 < x'01';
 0

tests/queries/046-binary-lte.sql

@@ -1,3 +1,3 @@
-select rowid from nulls where binary_10 <= x'01' order by 1;
+select rowid from nulls1 where binary_10 <= x'01' order by 1;
 0
 1

tests/queries/047-binary-gt.sql

@@ -1,2 +1,2 @@
-select rowid from nulls where binary_10 > x'60';
+select rowid from nulls1 where binary_10 > x'60';
 97

tests/queries/048-binary-gte.sql

@@ -1,3 +1,3 @@
-select rowid from nulls where binary_10 >= x'5F' order by 1;
+select rowid from nulls1 where binary_10 >= x'5F' order by 1;
 95
 97

tests/queries/061-string-eq-int.sql

@@ -1,2 +1,2 @@
-select string_7 from nulls where string_7 = 22;
+select string_7 from nulls1 where string_7 = 22;
 22

tests/queries/062-string-eq-double.sql

@@ -1 +1 @@
-select string_7 from nulls where string_7 = 22.0;
+select string_7 from nulls1 where string_7 = 22.0;

tests/queries/063-int8-eq-double.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 = 30.0;
+select int8_1 from nulls1 where int8_1 = 30.0;
 30

tests/queries/064-int8-eq-str.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 = '30.0';
+select int8_1 from nulls1 where int8_1 = '30.0';
 30

tests/queries/065-int8-eq-str2.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 = '30';
+select int8_1 from nulls1 where int8_1 = '30';
 30

tests/queries/066-int8-eq-bogus-str.sql

@@ -1 +1 @@
-select int8_1 from nulls where int8_1 = '30f';
+select int8_1 from nulls1 where int8_1 = '30f';

tests/queries/067-int8-lt-str.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 < '-46'
+select int8_1 from nulls1 where int8_1 < '-46'
 -48

tests/queries/068-int8-lt-double.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 < -46.0
+select int8_1 from nulls1 where int8_1 < -46.0
 -48

tests/queries/069-int8-lte-str.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 <= '-46'
+select int8_1 from nulls1 where int8_1 <= '-46'
 -46
 -48

tests/queries/070-int8-lte-double.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 <= -46.0
+select int8_1 from nulls1 where int8_1 <= -46.0
 -46
 -48

tests/queries/071-int8-gt-str.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 > '49'
+select int8_1 from nulls1 where int8_1 > '49'
 50

tests/queries/072-int8-gt-double.sql

@@ -1,2 +1,2 @@
-select int8_1 from nulls where int8_1 > 49.0
+select int8_1 from nulls1 where int8_1 > 49.0
 50

tests/queries/073-int8-gte-str.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 >= '49'
+select int8_1 from nulls1 where int8_1 >= '49'
 50
 49

tests/queries/074-int8-gte-double.sql

@@ -1,3 +1,3 @@
-select int8_1 from nulls where int8_1 >= 49.0
+select int8_1 from nulls1 where int8_1 >= 49.0
 50
 49

tests/queries/075-int8-ne-str.sql

@@ -1 +1 @@
-select int8_1 from nulls where rowid = 66 and int8_1 <> '-16'
+select int8_1 from nulls1 where rowid = 66 and int8_1 <> '-16'

tests/queries/076-int8-ne-double.sql

@@ -1 +1 @@
-select int8_1 from nulls where rowid = 66 and int8_1 <> -16.0
+select int8_1 from nulls1 where rowid = 66 and int8_1 <> -16.0

tests/queries/077-int64-gte-str.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 >= '49000000000'
+select int64_4 from nulls1 where int64_4 >= '49000000000'
 50000000000
 49000000000

tests/queries/078-int64-gte-double.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 >= 49000000000.0
+select int64_4 from nulls1 where int64_4 >= 49000000000.0
 50000000000
 49000000000

tests/queries/079-int65-gt-str.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 > '49000000000'
+select int64_4 from nulls1 where int64_4 > '49000000000'
 50000000000

tests/queries/080-int65-gt-double.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 > 49000000000.0
+select int64_4 from nulls1 where int64_4 > 49000000000.0
 50000000000

tests/queries/081-int64-eq-str.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 = '49000000000'
+select int64_4 from nulls1 where int64_4 = '49000000000'
 49000000000

tests/queries/082-int64-eq-double.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 = 49000000000.0
+select int64_4 from nulls1 where int64_4 = 49000000000.0
 49000000000

tests/queries/083-int64-lt-str.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 < '-46000000000'
+select int64_4 from nulls1 where int64_4 < '-46000000000'
 -47000000000

tests/queries/084-int64-lt-double.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where int64_4 < -46000000000.0
+select int64_4 from nulls1 where int64_4 < -46000000000.0
 -47000000000

tests/queries/085-int64-lte-str.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 <= '-45000000000'
+select int64_4 from nulls1 where int64_4 <= '-45000000000'
 -45000000000
 -47000000000

tests/queries/086-int64-lte-double.sql

@@ -1,3 +1,3 @@
-select int64_4 from nulls where int64_4 <= -45000000000.0
+select int64_4 from nulls1 where int64_4 <= -45000000000.0
 -45000000000
 -47000000000

tests/queries/087-int64-ne-str.sql

@@ -1 +1 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> '-7000000000'
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> '-7000000000'

tests/queries/088-int64-ne-double.sql

@@ -1 +1 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> -7000000000.0
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> -7000000000.0

tests/queries/089-int64-ne-some-str.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> '-8000000000'
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> '-8000000000'
 -7000000000

tests/queries/090-int64-ne-some-double.sql

@@ -1,2 +1,2 @@
-select int64_4 from nulls where rowid = 57 and int64_4 <> -8000000000.0
+select int64_4 from nulls1 where rowid = 57 and int64_4 <> -8000000000.0
 -7000000000

tests/queries/091-double-eq-str.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 = '99.0'
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = '99.0'
 99.00

tests/queries/092-double-eq-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 = 99
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 = 99
 99.00

tests/queries/093-double-gt-str.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 > '98'
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > '98'
 99.00

tests/queries/094-double-gt-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 > 98
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 > 98
 99.00

tests/queries/095-double-gte-str.sql

@@ -1,3 +1,3 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 >= '49.5'
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= '49.5'
 99.00
 49.50

tests/queries/096-double-gte-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) as double_6 from nulls where double_6 >= '99'
+select printf('%.2f', double_6) as double_6 from nulls1 where double_6 >= '99'
 99.00

tests/queries/097-double-lt-str.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 < '99.0' order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 < '99.0' order by double_6 desc limit 1
 49.50

tests/queries/098-double-lt-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 < 99 order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 < 99 order by double_6 desc limit 1
 49.50

tests/queries/099-double-lte-str.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 <= '99.0' order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 <= '99.0' order by double_6 desc limit 1
 99.00

tests/queries/100-double-lte-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where double_6 <= 99 order by double_6 desc limit 1
+select printf('%.2f', double_6) from nulls1 where double_6 <= 99 order by double_6 desc limit 1
 99.00

tests/queries/101-double-rowid-and-field-ne-str.sql

@@ -1 +1 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> '99.0'
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> '99.0'

tests/queries/102-double-rowid-and-field-ne-int.sql

@@ -1 +1 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> 99
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 99

tests/queries/103-double-rowid-and-field-ne2-some-str.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> '100'
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> '100'
 99.00

tests/queries/104-double-rowid-and-field-ne2-some-int.sql

@@ -1,2 +1,2 @@
-select printf('%.2f', double_6) from nulls where rowid = 0 and double_6 <> 100
+select printf('%.2f', double_6) from nulls1 where rowid = 0 and double_6 <> 100
 99.00

tests/queries/107-rowid-gt-0.sql

@@ -1,2 +0,0 @@
-select count(*) from no_nulls2 where rowid > 0
-98

tests/queries/108-rowid-gte-0.sql

@@ -1,2 +0,0 @@
-select count(*) from no_nulls2 where rowid >= 0
-99

tests/queries/109-bool-where-eq-0.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where bool_0 = 0
+select count(*) from nulls1 where bool_0 = 0
 44

tests/queries/110-bool-where-eq-1.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where bool_0 = 1
+select count(*) from nulls1 where bool_0 = 1
 5

tests/queries/111-bool-where-bool.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where bool_0
+select count(*) from nulls1 where bool_0
 5

tests/queries/112-bool-where-not-bool.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where not bool_0
+select count(*) from nulls1 where not bool_0
 44

tests/queries/113-bool-where-gt-0.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where bool_0 > 0
+select count(*) from nulls1 where bool_0 > 0
 5

tests/queries/114-bool-where-gte-0.sql

@@ -1,2 +1,2 @@
-select count(*) from nulls where bool_0 >= 0
+select count(*) from nulls1 where bool_0 >= 0
 49