Changeset: d0618210c874 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0618210c874 Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out Branch: default Log Message:
Approve non-int128 stable.out diffs (truncated from 10047 to 300 lines): diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out --- a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out @@ -308,8 +308,8 @@ Ready. # WHERE (c<=d-2 OR c>=d+2) # ORDER BY 4,2,1,3 #; -% .L1, .L2, .L4, .t1 # table_name -% L1, L2, L4, c # name +% .L1, .L2, .L3, .t1 # table_name +% L1, L2, L3, c # name % bigint, smallint, wrd, int # type % 4, 3, 1, 3 # length [ 1067, 333, 0, 106 ] @@ -503,8 +503,8 @@ Ready. # OR d NOT BETWEEN 110 AND 150 # ORDER BY 5,3,6,1,2,4 #; -% .L2, .L3, .L4, .L6, .t1, .L7 # table_name -% L2, L3, L4, L6, c, L7 # name +% .L2, .L3, .L4, .L5, .t1, .L6 # table_name +% L2, L3, L4, L5, c, L6 # name % bigint, smallint, bigint, wrd, int, bigint # type % 4, 3, 4, 1, 3, 2 # length [ 1000, 444, 610, 0, 102, -2 ] @@ -547,8 +547,8 @@ Ready. # OR c>d # ORDER BY 3,5,4,1,2 #; -% .L1, .t1, .L2, .L3, .L5 # table_name -% L1, d, L2, L3, L5 # name +% .L1, .t1, .L2, .L3, .L4 # table_name +% L1, d, L2, L3, L4 # name % wrd, int, bigint, bigint, wrd # type % 1, 3, 4, 2, 2 # length [ 0, 101, 1014, 4, 0 ] @@ -1005,8 +1005,8 @@ Ready. # AND c BETWEEN b-2 AND d+2 # ORDER BY 6,1,7,3,4,5,2 #; -% .L1, .L2, .L3, .t1, .L4, .L5, .L7 # table_name -% L1, L2, L3, a, L4, L5, L7 # name +% .L1, .L2, .L3, .t1, .L4, .L5, .L6 # table_name +% L1, L2, L3, a, L4, L5, L6 # name % bigint, bigint, smallint, int, bigint, bigint, wrd # type % 4, 1, 3, 3, 4, 3, 2 # length [ 674, 1, 111, 111, 1130, 335, 2 ] @@ -1235,8 +1235,8 @@ Ready. # WHERE c BETWEEN b-2 AND d+2 # ORDER BY 7,2,5,1,3,6,4 #; -% .L1, .L2, .L3, .L4, .L5, .L7, .L10 # table_name -% L1, L2, L3, L4, L5, L7, L10 # name +% .L1, .L2, .L3, .L4, .L5, .L6, .L7 # table_name +% L1, L2, L3, L4, L5, L6, L7 # name % smallint, bigint, bigint, bigint, int, wrd, bigint # type % 3, 4, 3, 1, 3, 1, 4 # length [ 555, 1529, 102, 2, 104, 0, 610 ] @@ -1316,8 +1316,8 @@ Ready. # WHERE b>c # ORDER BY 2,6,5,4,3,1 #; -% .L1, .L2, .L3, .t1, .t1, .L5 # table_name -% L1, L2, L3, a, e, L5 # name +% .L1, .L2, .L3, .t1, .t1, .L4 # table_name +% L1, L2, L3, a, e, L4 # name % bigint, bigint, bigint, int, int, wrd # type % 3, 3, 2, 3, 3, 2 # length [ 122, 369, 1, 121, 120, 4 ] @@ -1476,8 +1476,8 @@ Ready. # OR EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 3,1,2 #; -% .L1, .t1, .L3 # table_name -% L1, e, L3 # name +% .L1, .t1, .L2 # table_name +% L1, e, L2 # name % bigint, int, wrd # type % 3, 3, 1 # length [ 102, 103, 0 ] @@ -1785,8 +1785,8 @@ Ready. # OR c>d # ORDER BY 2,3,4,1 #; -% .L1, .L3, .L4, .L5 # table_name -% L1, L3, L4, L5 # name +% .L1, .L2, .L3, .L4 # table_name +% L1, L2, L3, L4 # name % bigint, wrd, int, bigint # type % 2, 2, 3, 4 # length [ -2, 0, 104, 1014 ] @@ -1867,8 +1867,8 @@ Ready. # WHERE d>e # ORDER BY 3,4,1,2,5 #; -% .L1, .L2, .L4, .L5, .L6 # table_name -% L1, L2, L4, L5, L6 # name +% .L1, .L2, .L3, .L4, .L5 # table_name +% L1, L2, L3, L4, L5 # name % smallint, bigint, wrd, bigint, bigint # type % 3, 4, 2, 4, 3 # length [ 222, 1680, 2, 1130, 335 ] @@ -1948,8 +1948,8 @@ Ready. # WHERE (e>c OR e<d) # ORDER BY 1,2,3 #; -% .L1, .L2, .L4 # table_name -% L1, L2, L4 # name +% .L1, .L2, .L3 # table_name +% L1, L2, L3 # name % bigint, bigint, wrd # type % 2, 4, 1 # length [ -4, 2476, 0 ] @@ -2260,8 +2260,8 @@ Ready. # AND c>d # ORDER BY 2,5,6,4,1,3 #; -% .L1, .L3, .L5, .L6, .L7, .L10 # table_name -% L1, L3, L5, L6, L7, L10 # name +% .L1, .L2, .L4, .L5, .L6, .L7 # table_name +% L1, L2, L4, L5, L6, L7 # name % bigint, wrd, bigint, bigint, bigint, bigint # type % 3, 2, 4, 1, 4, 4 # length [ 117, 3, 1180, 3, 1172, 1757 ] @@ -2341,8 +2341,8 @@ Ready. # WHERE (e>a AND e<b) # ORDER BY 3,2,4,1 #; -% .L1, .L3, .t1, .L4 # table_name -% L1, L3, c, L4 # name +% .L1, .L2, .t1, .L3 # table_name +% L1, L2, c, L3 # name % bigint, wrd, int, bigint # type % 2, 2, 3, 4 # length [ 3, 3, 119, 1757 ] @@ -2370,8 +2370,8 @@ Ready. # OR EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 3,4,5,1,2 #; -% .L1, .L2, .L3, .L5, .L6 # table_name -% L1, L2, L3, L5, L6 # name +% .L1, .L2, .L3, .L4, .L5 # table_name +% L1, L2, L3, L4, L5 # name % bigint, bigint, bigint, wrd, bigint # type % 1, 4, 2, 2, 2 # length [ 2, 2131, -4, 8, 1 ] @@ -2722,8 +2722,8 @@ Ready. # AND b>c # ORDER BY 2,4,3,1 #; -% .L1, .L3, .L4, .L5 # table_name -% L1, L3, L4, L5 # name +% .L1, .L2, .L3, .L4 # table_name +% L1, L2, L3, L4 # name % bigint, wrd, bigint, bigint # type % 4, 2, 2, 3 # length [ 1226, 4, 1, 369 ] @@ -3057,8 +3057,8 @@ Ready. # OR b>c # ORDER BY 1,3,5,4,2 #; -% .t1, .t1, .L1, .L2, .L4 # table_name -% a, d, L1, L2, L4 # name +% .t1, .t1, .L1, .L2, .L3 # table_name +% a, d, L1, L2, L3 # name % int, int, bigint, bigint, wrd # type % 3, 3, 4, 2, 1 # length [ 104, 101, 1529, 4, 0 ] @@ -3309,8 +3309,8 @@ Ready. # WHERE EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 1,3,7,2,5,6,4 #; -% .L1, .t1, .L2, .L4, .L5, .L6, .L7 # table_name -% L1, c, L2, L4, L5, L6, L7 # name +% .L1, .t1, .L2, .L3, .L4, .L5, .L6 # table_name +% L1, c, L2, L3, L4, L5, L6 # name % bigint, int, smallint, wrd, bigint, bigint, bigint # type % 4, 3, 3, 2, 4, 3, 2 # length [ 1067, 106, 333, 1, 635, 317, -1 ] @@ -3568,8 +3568,8 @@ Ready. # WHERE d>e # ORDER BY 4,2,1,5,3 #; -% .L1, .L2, .L4, .L5, .L6 # table_name -% L1, L2, L4, L5, L6 # name +% .L1, .L2, .L3, .L4, .L5 # table_name +% L1, L2, L3, L4, L5 # name % bigint, smallint, wrd, bigint, bigint # type % 3, 3, 1, 2, 4 # length [ 455, 333, 0, -4, 905 ] @@ -3636,8 +3636,8 @@ Ready. # WHERE c>d # ORDER BY 4,3,5,6,2,1 #; -% .L1, .t1, .t1, .L2, .L3, .L5 # table_name -% L1, b, d, L2, L3, L5 # name +% .L1, .t1, .t1, .L2, .L3, .L4 # table_name +% L1, b, d, L2, L3, L4 # name % bigint, int, int, bigint, bigint, wrd # type % 1, 3, 3, 4, 3, 2 # length [ 1, 100, 101, 1529, 304, 0 ] @@ -3762,8 +3762,8 @@ Ready. # AND c>d # ORDER BY 6,5,4,1,3,2 #; -% .L1, .L2, .L4, .L6, .L7, .L10 # table_name -% L1, L2, L4, L6, L7, L10 # name +% .L1, .L2, .L3, .L4, .L5, .L6 # table_name +% L1, L2, L3, L4, L5, L6 # name % bigint, bigint, wrd, wrd, bigint, bigint # type % 3, 3, 1, 2, 1, 2 # length [ 351, 117, 0, 3, 1, -3 ] @@ -3871,8 +3871,8 @@ Ready. # OR b>c # ORDER BY 2,1,3 #; -% .L1, .L2, .L4 # table_name -% L1, L2, L4 # name +% .L1, .L2, .L3 # table_name +% L1, L2, L3 # name % bigint, bigint, wrd # type % 3, 3, 1 # length [ 102, 304, 0 ] @@ -3983,8 +3983,8 @@ Ready. # AND (c<=d-2 OR c>=d+2) # ORDER BY 6,7,2,1,3,4,5 #; -% .L1, .L3, .L4, .L5, .L6, .L7, .L10 # table_name -% L1, L3, L4, L5, L6, L7, L10 # name +% .L1, .L2, .L3, .L4, .L5, .L6, .L7 # table_name +% L1, L2, L3, L4, L5, L6, L7 # name % bigint, wrd, bigint, bigint, bigint, bigint, smallint # type % 2, 2, 1, 3, 1, 4, 3 # length [ -3, 13, 1, 167, 1, 1000, 333 ] @@ -4021,8 +4021,8 @@ Ready. # OR b>c # ORDER BY 3,5,4,2,6,7,1 #; -% .L1, .L2, .L3, .t1, .L4, .L5, .L7 # table_name -% L1, L2, L3, a, L4, L5, L7 # name +% .L1, .L2, .L3, .t1, .L4, .L5, .L6 # table_name +% L1, L2, L3, a, L4, L5, L6 # name % bigint, smallint, bigint, int, bigint, bigint, wrd # type % 2, 3, 3, 3, 1, 4, 1 # length [ 1, 444, 304, 104, 2, 1529, 0 ] @@ -4197,8 +4197,8 @@ Ready. # OR EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 5,1,4,7,3,2,6 #; -% .L1, .L2, .t1, .L3, .L4, .L6, .L7 # table_name -% L1, L2, b, L3, L4, L6, L7 # name +% .L1, .L2, .t1, .L3, .L4, .L5, .L6 # table_name +% L1, L2, b, L3, L4, L5, L6 # name % bigint, bigint, int, bigint, bigint, wrd, smallint # type % 3, 4, 3, 2, 1, 1, 3 # length [ 317, 1612, 105, -2, 1, 0, 333 ] @@ -4416,8 +4416,8 @@ Ready. # OR b>c # ORDER BY 3,5,4,2,1 #; -% .L1, .t1, .L2, .L4, .L5 # table_name -% L1, c, L2, L4, L5 # name +% .L1, .t1, .L2, .L3, .L4 # table_name +% L1, c, L2, L3, L4 # name % bigint, int, bigint, wrd, bigint # type % 2, 3, 2, 1, 3 # length [ 2, 141, -4, 0, 142 ] @@ -4491,8 +4491,8 @@ Ready. # AND c>d # ORDER BY 3,5,1,4,2 #; -% .L1, .t1, .L2, .L4, .L5 # table_name -% L1, d, L2, L4, L5 # name +% .L1, .t1, .L2, .L3, .L4 # table_name +% L1, d, L2, L3, L4 # name % bigint, int, bigint, wrd, bigint # type % 3, 3, 1, 1, 2 # length [ 827, 136, 2, 7, -1 ] @@ -4924,8 +4924,8 @@ Ready. # FROM t1 # ORDER BY 7,3,2,6,4,5,1 #; -% .L1, .L2, .L4, .L5, .L6, .t1, .L7 # table_name -% L1, L2, L4, L5, L6, c, L7 # name +% .L1, .L2, .L3, .L4, .L5, .t1, .L6 # table_name +% L1, L2, L3, L4, L5, c, L6 # name % wrd, bigint, wrd, bigint, bigint, int, bigint # type % 1, 2, 2, 2, 4, 3, 3 # length [ 0, 1, 0, -2, 1014, 102, 304 ] @@ -5311,8 +5311,8 @@ Ready. # AND (e>a AND e<b) # ORDER BY 7,2,4,6,1,3,5 #; -% .L1, .L2, .t1, .L3, .L5, .L7, .t1 # table_name -% L1, L2, a, L3, L5, L7, d # name +% .L1, .L2, .t1, .L3, .L5, .L6, .t1 # table_name +% L1, L2, a, L3, L5, L6, d # name % smallint, bigint, int, smallint, bigint, wrd, int # type % 1, 1, 1, 1, 1, 1, 1 # length #SELECT a+b*2+c*3+d*4+e*5 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
