Changeset: f7c5d6bf3a5c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7c5d6bf3a5c Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128 sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out.int128 Branch: subquery Log Message:
approved output (only output relation name changes) diffs (truncated from 21515 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 @@ -368,8 +368,8 @@ Ready. # OR c>d # ORDER BY 1 #; -% .L5 # table_name -% L5 # name +% .L4 # table_name +% L4 # name % bigint # type % 2 # length [ 0 ] @@ -404,8 +404,8 @@ Ready. # OR b>c # ORDER BY 1,4,3,2,5 #; -% .t1, .L6, .L11, .L13, .L15 # table_name -% a, L6, L11, L13, L15 # name +% sys.t1, .L5, sys.L7, sys.L11, sys.L13 # table_name +% a, L5, L7, L11, L13 # name % int, bigint, bigint, bigint, smallint # type % 3, 1, 2, 2, 3 # length [ 104, 0, -2, 4, 555 ] @@ -697,8 +697,8 @@ Ready. # WHERE c BETWEEN b-2 AND d+2 # ORDER BY 1,2,3 #; -% .t1, .L3, .L10 # table_name -% c, L3, L10 # name +% sys.t1, sys.L3, .L7 # table_name +% c, L3, L7 # name % int, bigint, bigint # type % 3, 2, 2 # length [ 102, 4, 0 ] @@ -799,8 +799,8 @@ Ready. # FROM t1 # ORDER BY 4,3,5,1,6,2,7 #; -% .L2, .t1, .L10, .L13, .t1, .L16, .L20 # table_name -% L2, c, L10, L13, b, L16, L20 # name +% sys.L2, sys.t1, .L7, sys.L11, sys.t1, sys.L14, sys.L16 # table_name +% L2, c, L7, L11, b, L14, L16 # name % smallint, int, bigint, bigint, int, smallint, bigint # type % 3, 3, 2, 2, 3, 3, 3 # length [ 333, 134, 6, -4, 130, 444, 391 ] @@ -949,8 +949,8 @@ Ready. # WHERE d NOT BETWEEN 110 AND 150 # ORDER BY 1,4,5,6,2,3 #; -% .t1, .L6, .L11, .L13, .L15, .t1 # table_name -% e, L6, L11, L13, L15, c # name +% sys.t1, .L5, sys.L7, sys.L11, sys.L13, sys.t1 # table_name +% e, L5, L7, L11, L13, c # name % int, bigint, bigint, smallint, bigint, int # type % 3, 2, 2, 3, 2, 3 # length [ 103, 0, 4, 555, 1, 102 ] @@ -1089,8 +1089,8 @@ Ready. # WHERE (e>c OR e<d) # ORDER BY 3,5,4,1,2 #; -% .L5, .L13, .L17, .L21, .L23 # table_name -% L5, L13, L17, L21, L23 # name +% .L4, .L10, sys.L12, sys.L14, sys.L16 # table_name +% L4, L10, L12, L14, L16 # name % bigint, bigint, smallint, bigint, bigint # type % 2, 1, 3, 2, 2 # length [ 29, 0, 111, -1, -4 ] @@ -1127,8 +1127,8 @@ Ready. # AND (a>b-2 AND a<b+2) # ORDER BY 1 #; -% .L5 # table_name -% L5 # name +% .L4 # table_name +% L4 # name % bigint # type % 1 # length #SELECT CASE a+1 WHEN b THEN 111 WHEN c THEN 222 @@ -1144,8 +1144,8 @@ Ready. # OR c>d # ORDER BY 3,2,1,4,5 #; -% .L2, .t1, .L5, .L12, .L15 # table_name -% L2, b, L5, L12, L15 # name +% sys.L2, sys.t1, sys.L5, .L11, sys.L13 # table_name +% L2, b, L5, L11, L13 # name % smallint, int, bigint, bigint, smallint # type % 3, 3, 3, 2, 3 # length [ 555, 100, 304, 0, 444 ] @@ -1515,8 +1515,8 @@ Ready. # OR (e>a AND e<b) # ORDER BY 4,1,3,2 #; -% .L2, .L4, .L11, .L14 # table_name -% L2, L4, L11, L14 # name +% sys.L2, sys.L4, .L10, sys.L12 # table_name +% L2, L4, L10, L12 # name % bigint, bigint, bigint, bigint # type % 2, 3, 1, 2 # length [ -3, 579, 0, -2 ] @@ -1582,8 +1582,8 @@ Ready. # OR (a>b-2 AND a<b+2) # ORDER BY 2,6,3,5,4,1 #; -% .L14, .L21, .L24, .t1, .L33, .L37 # table_name -% L14, L21, L24, b, L33, L37 # name +% .L11, .L15, .L17, .t1, .L24, .L26 # table_name +% L11, L15, L17, b, L24, L26 # name % smallint, bigint, bigint, int, bigint, bigint # type % 3, 1, 2, 3, 2, 3 # length [ 333, 0, -1, 105, 1, 317 ] @@ -1682,8 +1682,8 @@ Ready. # WHERE EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 1,5,3,2,4 #; -% .L7, .L11, .L13, .L15, .L22 # table_name -% L7, L11, L13, L15, L22 # name +% sys.L4, sys.L6, sys.L10, sys.L12, .L16 # table_name +% L4, L6, L10, L12, L16 # name % smallint, bigint, int, bigint, bigint # type % 3, 2, 3, 1, 1 # length [ 111, -1, 245, 2, 0 ] @@ -1889,8 +1889,8 @@ Ready. # WHERE b>c # ORDER BY 1,2 #; -% .L5, .L7 # table_name -% L5, L7 # name +% .L4, sys.L6 # table_name +% L4, L6 # name % bigint, bigint # type % 1, 2 # length [ 0, -4 ] @@ -2153,8 +2153,8 @@ Ready. # WHERE d NOT BETWEEN 110 AND 150 # ORDER BY 1,3,4,2 #; -% .t1, .L3, .L11, .L17 # table_name -% e, L3, L11, L17 # name +% sys.t1, sys.L3, sys.L11, .L15 # table_name +% e, L3, L11, L15 # name % int, bigint, bigint, bigint # type % 3, 2, 4, 2 # length [ 103, -2, 1000, 0 ] @@ -2324,8 +2324,8 @@ Ready. # AND e+d BETWEEN a+b-10 AND c+130 # ORDER BY 1,2,4,5,3 #; -% sys.L7, sys.t1, sys.t1, sys.L13, sys.L15 # table_name -% L7, d, a, L13, L15 # name +% sys.L4, sys.t1, sys.t1, sys.L10, sys.L12 # table_name +% L4, d, a, L10, L12 # name % bigint, int, int, bigint, smallint # type % 3, 3, 3, 2, 3 # length [ 317, 108, 107, -1, 333 ] @@ -2744,8 +2744,8 @@ Ready. # AND EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 2,1 #; -% sys.t1, sys.L10 # table_name -% b, L10 # name +% sys.t1, sys.L5 # table_name +% b, L5 # name % int, bigint # type % 3, 1 # length [ 186, 1 ] @@ -2765,8 +2765,8 @@ Ready. # FROM t1 # ORDER BY 4,5,1,3,7,6,2 #; -% .L2, .L4, .t1, .L12, .L15, .t1, .t1 # table_name -% L2, L4, b, L12, L15, a, e # name +% sys.L2, sys.L4, sys.t1, .L11, sys.L13, sys.t1, sys.t1 # table_name +% L2, L4, b, L11, L13, a, e # name % smallint, bigint, int, bigint, bigint, int, int # type % 3, 2, 3, 1, 2, 3, 3 # length [ 111, 2, 249, 0, -4, 245, 246 ] @@ -2851,8 +2851,8 @@ Ready. # WHERE (e>c OR e<d) # ORDER BY 2,1,3 #; -% .L2, .L4, .L11 # table_name -% L2, L4, L11 # name +% sys.L2, sys.L4, .L10 # table_name +% L2, L4, L10 # name % smallint, bigint, bigint # type % 3, 3, 1 # length [ 444, 304, 0 ] @@ -2929,8 +2929,8 @@ Ready. # OR c BETWEEN b-2 AND d+2 # ORDER BY 3,2,1 #; -% .L21, .L23, .t1 # table_name -% L21, L23, d # name +% .L16, .L20, .t1 # table_name +% L16, L20, d # name % bigint, int, int # type % 2, 3, 3 # length [ 4, 104, 101 ] @@ -3135,8 +3135,8 @@ Ready. # OR b>c # ORDER BY 1,3,5,2,4 #; -% .L2, .t1, .L11, .L17, .L23 # table_name -% L2, c, L11, L17, L23 # name +% sys.L2, sys.t1, sys.L11, .L15, sys.L17 # table_name +% L2, c, L11, L15, L17 # name % bigint, int, bigint, bigint, bigint # type % 2, 3, 4, 2, 2 # length [ -4, 244, 486, 28, 3 ] @@ -3179,8 +3179,8 @@ Ready. # OR (e>c OR e<d) # ORDER BY 4,6,5,1,3,7,2 #; -% .L2, .L4, .L6, .L13, .L16, .L20, .t1 # table_name -% L2, L4, L6, L13, L16, L20, d # name +% sys.L2, sys.L4, sys.L6, .L12, sys.L14, sys.L16, sys.t1 # table_name +% L2, L4, L6, L12, L14, L16, d # name % bigint, smallint, bigint, bigint, int, bigint, int # type % 2, 3, 3, 1, 3, 2, 3 # length [ 1, 333, 455, 0, 153, -4, 154 ] @@ -3351,8 +3351,8 @@ Ready. # AND (c<=d-2 OR c>=d+2) # ORDER BY 6,2,4,3,1,7,5 #; -% .L2, .L4, .L6, .L13, .L16, .t1, .t1 # table_name -% L2, L4, L6, L13, L16, d, a # name +% sys.L2, sys.L4, sys.L6, .L12, sys.L14, sys.t1, sys.t1 # table_name +% L2, L4, L6, L12, L14, d, a # name % int, smallint, bigint, bigint, bigint, int, int # type % 3, 3, 3, 2, 2, 3, 3 # length [ 107, 333, 317, 1, 2, 108, 107 ] @@ -3661,8 +3661,8 @@ Ready. # OR b>c # ORDER BY 4,2,1,5,3 #; -% .L14, .L16, .t1, .L21, .L23 # table_name -% L14, L16, a, L21, L23 # name +% .L11, .L13, .t1, .L16, .L20 # table_name +% L11, L13, a, L16, L20 # name % bigint, bigint, int, smallint, bigint # type % 1, 2, 3, 3, 2 # length [ 2, -1, 245, 111, -4 ] @@ -4103,8 +4103,8 @@ Ready. # AND d NOT BETWEEN 110 AND 150 # ORDER BY 1,3,6,2,5,4 #; -% .L2, .L4, .t1, .L12, .L15, .L17 # table_name -% L2, L4, a, L12, L15, L17 # name +% sys.L2, sys.L4, sys.t1, .L11, sys.L13, sys.L15 # table_name +% L2, L4, a, L11, L13, L15 # name % bigint, bigint, int, bigint, bigint, smallint # type % 2, 3, 3, 2, 2, 3 # length [ -1, 666, 220, 24, 2, 222 ] @@ -4146,8 +4146,8 @@ Ready. # OR EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 2,1 #; -% .t1, .L15 # table_name -% b, L15 # name +% .t1, .L12 # table_name +% b, L12 # name % int, int # type % 3, 3 # length [ 100, 104 ] @@ -4367,8 +4367,8 @@ Ready. # FROM t1 # ORDER BY 2,4,1,5,3 #; -% .L5, .L14, .t1, .L17, .L21 # table_name -% L5, L14, e, L17, L21 # name +% .L4, sys.L13, sys.t1, sys.L16, sys.L20 # table_name +% L4, L13, e, L16, L20 # name % bigint, bigint, int, smallint, bigint # type % 2, 4, 3, 3, 3 # length [ 15, 358, 177, 444, 529 ] @@ -4589,8 +4589,8 @@ Ready. # WHERE b>c # ORDER BY 1,2,3 #; -% .t1, .t1, .L7 # table_name -% b, d, L7 # name +% sys.t1, sys.t1, .L6 # table_name +% b, d, L6 # name % int, int, bigint # type % 3, 3, 1 # length [ 124, 122, 0 ] @@ -4652,8 +4652,8 @@ Ready. # WHERE EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b) # ORDER BY 1,3,2 #; -% sys.L13, sys.L15, sys.L17 # table_name -% L13, L15, L17 # name +% sys.L10, sys.L12, sys.L14 # table_name +% L10, L12, L14 # name % bigint, bigint, bigint # type % 4, 2, 3 # length [ 358, -1, 529 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
