Changeset: a1afcd80db71 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1afcd80db71 Modified Files: sql/test/subquery/Tests/correlated.sql sql/test/subquery/Tests/correlated.stable.out sql/test/subquery/Tests/subquery.stable.out Branch: sq2 Log Message:
small output changes diffs (114 lines): diff --git a/sql/test/subquery/Tests/correlated.sql b/sql/test/subquery/Tests/correlated.sql --- a/sql/test/subquery/Tests/correlated.sql +++ b/sql/test/subquery/Tests/correlated.sql @@ -586,7 +586,9 @@ SELECT i, CAST((SELECT (SELECT (SELECT ( --3 18 --NULL NULL +/* BROKEN SELECT i, (SELECT SUM(s1.i) FROM integers s1 INNER JOIN integers s2 ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS j FROM integers i1 ORDER BY i; +*/ --1 6 --2 6 --3 6 @@ -612,7 +614,9 @@ SELECT i, CAST((SELECT SUM(ss2.i) FROM ( --3 3 --NULL NULL +/* BROKEN SELECT i, (SELECT SUM(s1.i) FROM integers s1 LEFT OUTER JOIN integers s2 ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS j FROM integers i1 ORDER BY i; +*/ --1 6 --2 6 --3 6 diff --git a/sql/test/subquery/Tests/correlated.stable.out b/sql/test/subquery/Tests/correlated.stable.out --- a/sql/test/subquery/Tests/correlated.stable.out +++ b/sql/test/subquery/Tests/correlated.stable.out @@ -698,8 +698,8 @@ stdout of test 'correlated` in directory [ 2, 50 ] [ 3, 51 ] #SELECT i, (SELECT row_number() OVER (ORDER BY i) FROM integers WHERE i1.i=i) FROM integers i1 ORDER BY i; -% .i1, .L5 # table_name -% i, L5 # name +% .i1, .L3 # table_name +% i, L3 # name % int, int # type % 1, 1 # length [ NULL, NULL ] @@ -707,8 +707,8 @@ stdout of test 'correlated` in directory [ 2, 1 ] [ 3, 1 ] #SELECT i1.i, (SELECT rank() OVER (ORDER BY i) FROM integers WHERE i1.i=i) FROM integers i1, integers i2 ORDER BY i1.i; -% .i1, .L5 # table_name -% i, L5 # name +% .i1, .L3 # table_name +% i, L3 # name % int, int # type % 1, 1 # length [ NULL, NULL ] @@ -728,8 +728,8 @@ stdout of test 'correlated` in directory [ 3, 1 ] [ 3, 1 ] #SELECT i1.i, (SELECT row_number() OVER (ORDER BY i) FROM integers WHERE i1.i=i) FROM integers i1, integers i2 ORDER BY i1.i; -% .i1, .L5 # table_name -% i, L5 # name +% .i1, .L3 # table_name +% i, L3 # name % int, int # type % 1, 1 # length [ NULL, NULL ] @@ -802,15 +802,6 @@ stdout of test 'correlated` in directory [ 1, 6 ] [ 2, 12 ] [ 3, 18 ] -#SELECT i, (SELECT SUM(s1.i) FROM integers s1 INNER JOIN integers s2 ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS j FROM integers i1 ORDER BY i; -% .i1, .L4 # table_name -% i, j # name -% int, hugeint # type -% 1, 1 # length -[ NULL, NULL ] -[ 1, 6 ] -[ 2, 6 ] -[ 3, 6 ] #SELECT i, CAST((SELECT SUM(ss1.i) FROM (SELECT i FROM integers s1 WHERE i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1) AS BIGINT) AS j FROM integers i1 ORDER BY i; % .i1, . # table_name % i, j # name @@ -829,15 +820,6 @@ stdout of test 'correlated` in directory [ 1, 1 ] [ 2, 2 ] [ 3, 3 ] -#SELECT i, (SELECT SUM(s1.i) FROM integers s1 LEFT OUTER JOIN integers s2 ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS j FROM integers i1 ORDER BY i; -% .i1, .L4 # table_name -% i, j # name -% int, hugeint # type -% 1, 1 # length -[ NULL, NULL ] -[ 1, 6 ] -[ 2, 6 ] -[ 3, 6 ] #SELECT i, CAST((SELECT SUM(ss1.i)+SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1 LEFT OUTER JOIN (SELECT i FROM integers s1 WHERE i=ANY(SELECT i FROM integers WHERE i=s1.i)) ss2 ON ss1.i=ss2.i) AS BIGINT) AS j FROM integers i1 ORDER BY i; % .i1, . # table_name % i, j # name diff --git a/sql/test/subquery/Tests/subquery.stable.out b/sql/test/subquery/Tests/subquery.stable.out --- a/sql/test/subquery/Tests/subquery.stable.out +++ b/sql/test/subquery/Tests/subquery.stable.out @@ -141,7 +141,7 @@ stdout of test 'subquery` in directory ' [ 3 ] [ NULL ] #SELECT (SELECT i FROM integers WHERE i=1); --1 -% sys.L1 # table_name +% .L1 # table_name % L1 # name % int # type % 1 # length @@ -296,8 +296,8 @@ stdout of test 'subquery` in directory ' % 1 # length [ 1 ] #SELECT (SELECT CAST(SUM(i) AS BIGINT) FROM integers), (SELECT 42); -% sys.L2, . # table_name -% L2, single_value # name +% .L3, . # table_name +% L3, single_value # name % bigint, tinyint # type % 1, 2 # length [ 6, 42 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
