Changeset: fab0afecb1a1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fab0afecb1a1 Modified Files: sql/test/subquery/Tests/all.stable.out sql/test/subquery/Tests/any.stable.out sql/test/subquery/Tests/any_all.stable.out sql/test/subquery/Tests/correlated.stable.err sql/test/subquery/Tests/correlated.stable.out sql/test/subquery/Tests/exists.stable.out sql/test/subquery/Tests/scalar.stable.out sql/test/subquery/Tests/subquery.stable.out sql/test/subquery/Tests/subquery2.stable.err sql/test/subquery/Tests/subquery2.stable.out sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery3.stable.out Branch: sq2default Log Message:
approved output diffs (truncated from 2518 to 300 lines): diff --git a/sql/test/subquery/Tests/all.stable.out b/sql/test/subquery/Tests/all.stable.out --- a/sql/test/subquery/Tests/all.stable.out +++ b/sql/test/subquery/Tests/all.stable.out @@ -31,8 +31,8 @@ stdout of test 'all` in directory 'sql/t % int # type % 1 # length #SELECT i, i >= ALL(SELECT i FROM integers) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -46,8 +46,8 @@ stdout of test 'all` in directory 'sql/t % 1 # length [ 3 ] #SELECT i, i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -86,7 +86,7 @@ stdout of test 'all` in directory 'sql/t % 1 # length [ 1 ] #SELECT i FROM integers WHERE i = ALL(SELECT i FROM integers WHERE i=1); -- 1 -% sys.integers # table_name +% .integers # table_name % i # name % int # type % 1 # length @@ -99,10 +99,13 @@ stdout of test 'all` in directory 'sql/t [ 2 ] [ 3 ] #SELECT i FROM integers WHERE i = ALL(SELECT i FROM integers WHERE i IS NOT NULL); -- empty -% sys.integers # table_name +% .integers # table_name % i # name % int # type % 1 # length +[ 1 ] +[ 2 ] +[ 3 ] #SELECT i FROM integers WHERE i <> ALL(SELECT i FROM integers WHERE i IS NOT NULL); -- empty % sys.integers # table_name % i # name @@ -118,8 +121,8 @@ stdout of test 'all` in directory 'sql/t [ 2 ] [ 3 ] #SELECT i, i <> ALL(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% .integers, .L13 # table_name -% i, L13 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, true ] @@ -127,8 +130,8 @@ stdout of test 'all` in directory 'sql/t [ 2, true ] [ 3, true ] #SELECT i, i > ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -136,8 +139,8 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i, i = ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% .integers, .L13 # table_name -% i, L13 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -145,8 +148,8 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i, i >= ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -154,8 +157,8 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i, i <= ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -163,8 +166,8 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i, i < ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -172,8 +175,8 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i, i <> ANY(SELECT i FROM integers WHERE i>10) FROM integers ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, false ] @@ -181,31 +184,31 @@ stdout of test 'all` in directory 'sql/t [ 2, false ] [ 3, false ] #SELECT i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL) AS k, CAST(SUM(i) AS BIGINT) FROM integers GROUP BY k ORDER BY k; -% sys.L6, sys.L11 # table_name -% k, L11 # name +% ., .%3 # table_name +% k, %3 # name % boolean, bigint # type % 5, 1 # length [ NULL, NULL ] [ false, 3 ] [ true, 3 ] #SELECT CAST(SUM(i) AS BIGINT) FROM integers GROUP BY (i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL)) ORDER BY 1; -- NULL, 3, 3 -% sys.L10 # table_name -% L10 # name +% .%4 # table_name +% %4 # name % bigint # type % 1 # length [ NULL ] [ 3 ] [ 3 ] #SELECT i >= ALL(SELECT MIN(i) FROM integers WHERE i IS NOT NULL) AS k, CAST(SUM(i) AS BIGINT) FROM integers GROUP BY k ORDER BY k; -% sys.L5, sys.L10 # table_name -% k, L10 # name +% ., .%3 # table_name +% k, %3 # name % boolean, bigint # type % 5, 1 # length [ NULL, NULL ] [ true, 6 ] #SELECT i, CAST(SUM(CASE WHEN (i >= ALL(SELECT i FROM integers WHERE i=2)) THEN 1 ELSE 0 END) AS BIGINT) FROM integers GROUP BY i ORDER BY i; -% sys.integers, sys.L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, bigint # type % 1, 1 # length [ NULL, 0 ] diff --git a/sql/test/subquery/Tests/any.stable.out b/sql/test/subquery/Tests/any.stable.out --- a/sql/test/subquery/Tests/any.stable.out +++ b/sql/test/subquery/Tests/any.stable.out @@ -41,8 +41,8 @@ stdout of test 'any` in directory 'sql/t [ 2 ] [ 3 ] #SELECT i, i > ANY(SELECT i FROM integers) FROM integers ORDER BY i; -% sys.integers, sys.L4 # table_name -% i, L4 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -50,8 +50,8 @@ stdout of test 'any` in directory 'sql/t [ 2, true ] [ 3, true ] #SELECT i, i > ANY(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers ORDER BY i; -% sys.integers, sys.L4 # table_name -% i, L4 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -59,8 +59,8 @@ stdout of test 'any` in directory 'sql/t [ 2, true ] [ 3, true ] #SELECT i, NULL > ANY(SELECT i FROM integers) FROM integers ORDER BY i; -% sys.integers, .L6 # table_name -% i, L6 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -68,8 +68,8 @@ stdout of test 'any` in directory 'sql/t [ 2, NULL ] [ 3, NULL ] #SELECT i, NULL > ANY(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers ORDER BY i; -% sys.integers, .L6 # table_name -% i, L6 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -85,8 +85,8 @@ stdout of test 'any` in directory 'sql/t [ 2 ] [ 3 ] #SELECT i, i = ANY(SELECT i FROM integers WHERE i>2) FROM integers ORDER BY i; -% .integers, .L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -94,8 +94,8 @@ stdout of test 'any` in directory 'sql/t [ 2, false ] [ 3, true ] #SELECT i, i = ANY(SELECT i FROM integers WHERE i>2 OR i IS NULL) FROM integers ORDER BY i; -% .integers, .L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -103,8 +103,8 @@ stdout of test 'any` in directory 'sql/t [ 2, NULL ] [ 3, true ] #SELECT i, i <> ANY(SELECT i FROM integers WHERE i>2) FROM integers ORDER BY i; -% sys.integers, sys.L4 # table_name -% i, L4 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -112,8 +112,8 @@ stdout of test 'any` in directory 'sql/t [ 2, true ] [ 3, false ] #SELECT i, i <> ANY(SELECT i FROM integers WHERE i>2 OR i IS NULL) FROM integers ORDER BY i; -% sys.integers, sys.L4 # table_name -% i, L4 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -121,8 +121,8 @@ stdout of test 'any` in directory 'sql/t [ 2, true ] [ 3, NULL ] #SELECT i, i = ANY(SELECT i1.i FROM integers i1, integers i2, integers i3, integers i4, integers i5, integers i6 WHERE i1.i IS NOT NULL) FROM integers ORDER BY i; -% .integers, .L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -130,8 +130,8 @@ stdout of test 'any` in directory 'sql/t [ 2, true ] [ 3, true ] #SELECT i, i = ANY(SELECT i1.i FROM integers i1, integers i2, integers i3, integers i4, integers i5, integers i6 WHERE i1.i IS NOT NULL AND i1.i <> 2) FROM integers ORDER BY i; -% .integers, .L10 # table_name -% i, L10 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] @@ -139,8 +139,8 @@ stdout of test 'any` in directory 'sql/t [ 2, false ] [ 3, true ] #SELECT i, i >= ANY(SELECT i1.i FROM integers i1, integers i2, integers i3, integers i4, integers i5, integers i6 WHERE i1.i IS NOT NULL) FROM integers ORDER BY i; -% sys.integers, sys.L4 # table_name -% i, L4 # name +% .integers, .%3 # table_name +% i, %3 # name % int, boolean # type % 1, 5 # length [ NULL, NULL ] diff --git a/sql/test/subquery/Tests/any_all.stable.out b/sql/test/subquery/Tests/any_all.stable.out --- a/sql/test/subquery/Tests/any_all.stable.out +++ b/sql/test/subquery/Tests/any_all.stable.out @@ -23,50 +23,50 @@ stdout of test 'any_all` in directory 's # 19:15:04 > #SELECT 1 = ANY(SELECT 1); -- true -% .L11 # table_name -% L11 # name +% .%12 # table_name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
