Changeset: 3889e41d7e82 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3889e41d7e82
Modified Files:
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
sql/test/pg_regress/Tests/vacuum.stable.out.single
sql/test/subquery/Tests/correlated.sql
sql/test/subquery/Tests/correlated.stable.out
Branch: sq2default
Log Message:
merged
diffs (267 lines):
diff --git a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
--- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
+++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.sql
@@ -3,6 +3,6 @@ create table testola (color varchar(128)
insert into testola values ('blue', 12);
insert into testola values ('red', 2);
-select color, null, cast( sum(count) as bigint) from testola group by color;
+select color, null as something, cast( sum(count) as bigint) from testola
group by color;
drop table testola;
diff --git
a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
--- a/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
+++ b/sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
@@ -24,9 +24,9 @@ stdout of test 'groupby_with_NULL.SF-215
[ 1 ]
[ 1 ]
-#select color, null, cast( sum(count) as bigint) from testola group by color;
+#select color, null as something, cast( sum(count) as bigint) from testola
group by color;
% sys.testola, .%4, sys.%2 # table_name
-% color, %4, %2 # name
+% color, something, %2 # name
% varchar, char, bigint # type
% 4, 0, 2 # length
[ "blue", NULL, 12 ]
diff --git
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
---
a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
+++
b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
@@ -34,7 +34,7 @@ stdout of test 'duplicates-not-eliminate
% 1023 # length
function user.s4_0():void;
X_142:void := querylog.define("explain select sys.timestamp_to_str(case
when task0.\"sys_created_on\" >= \\'1999-10-31 09:00:00\\' and
task0.\"sys_created_on\" < \\'2000-04-02 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2000-04-02 10:00:00\\' and
task0.\"sys_created_on\" < \\'2000-10-29 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2000-10-29 09:00:00\\' and
task0.\"sys_created_on\" < \\'2001-04-01 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'2001-04-01 10:00:00\\' and
task0.\"sys_created_on\" < \\'2001-10-28 09:00:00\\' then
task0.\"sys_created_on\" + interval \\'-25200\\' second when
task0.\"sys_created_on\" >= \\'2001-10-28 09:00:00\\' and
task0.\"sys_created_on\" < \\'2002-04-07 10:00:00\\' then
task0.\"sys_created_on\" + interval \\'-28800\\' second when
task0.\"sys_created_on\" >= \\'
2002-04-07 10:00:00\\' and
- X_1608:bat[:str] := bat.pack("sys.L1":str);
+ X_1608:bat[:str] := bat.pack("sys.%2":str);
X_1609:bat[:str] := bat.pack("yearref":str);
X_1610:bat[:str] := bat.pack("clob":str);
X_1611:bat[:int] := bat.pack(0:int);
diff --git a/sql/test/pg_regress/Tests/vacuum.stable.out.single
b/sql/test/pg_regress/Tests/vacuum.stable.out.single
--- a/sql/test/pg_regress/Tests/vacuum.stable.out.single
+++ b/sql/test/pg_regress/Tests/vacuum.stable.out.single
@@ -84,13 +84,13 @@ stdout of test 'vacuum` in directory 'sq
% 1 # length
[ 0 ]
#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
-% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
% 3, 6, 1, 3, 4, 1, 4, 1, 1, 1,
5 # length
[ "sys", "vactst", "i", "int", 2049, 4, 8196, 0,
0, 0, false ]
#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
-% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
% 3, 6, 1, 3, 1, 1, 1, 1, 1, 1,
5 # length
@@ -140,34 +140,34 @@ stdout of test 'vacuum` in directory 'sq
#INSERT INTO vactst VALUES (0);
[ 1 ]
#SELECT count(*) FROM vactst;
-% .L2 # table_name
-% L2 # name
+% .%1 # table_name
+% %1 # name
% bigint # type
% 7 # length
[ 1048577 ]
#SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i;
-% sys.vactst, sys.L2 # table_name
+% sys.vactst, sys.%1 # table_name
% i, count # name
% int, bigint # type
% 1, 7 # length
[ 0, 1 ]
[ 1, 1048576 ]
#SELECT count(*) FROM vactst WHERE i <> 0;
-% sys.L2 # table_name
-% L2 # name
+% sys.%1 # table_name
+% %1 # name
% bigint # type
% 7 # length
[ 1048576 ]
#DELETE FROM vactst WHERE i <> 0;
[ 1048576 ]
#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
-% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
% 3, 6, 1, 3, 7, 1, 7, 1, 1, 1,
5 # length
[ "sys", "vactst", "i", "int", 1048577, 4,
4194308, 0, 0, 0, false ]
#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
-% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3, .%3,
.%3 # table_name
% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
% 3, 6, 1, 3, 1, 1, 1, 1, 1, 1,
5 # length
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
@@ -566,7 +566,7 @@ SELECT i, CAST((SELECT SUM(i)+(SELECT 42
--3 51
--NULL NULL
-SELECT i, (SELECT ((SELECT ((SELECT ((SELECT
SUM(i)+SUM(i4.i)+SUM(i3.i)+SUM(i2.i)+SUM(i1.i) FROM integers i5)) FROM integers
i4)) FROM integers i3)) FROM integers i2) AS j FROM integers i1 GROUP BY i
ORDER BY i;
+SELECT i, CAST((SELECT ((SELECT ((SELECT ((SELECT
SUM(i)+SUM(i4.i)+SUM(i3.i)+SUM(i2.i)+SUM(i1.i) FROM integers i5)) FROM integers
i4)) FROM integers i3)) FROM integers i2) AS BIGINT) AS j FROM integers i1
GROUP BY i ORDER BY i;
--1 25
--2 26
--3 27
@@ -578,13 +578,13 @@ SELECT i, CAST((SELECT (SELECT (SELECT (
--3 18
--NULL NULL
-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;
+SELECT i, CAST((SELECT SUM(s1.i) FROM integers s1 INNER JOIN integers s2 ON
(SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS BIGINT) AS j FROM integers i1 ORDER
BY i;
--1 6
--2 6
--3 6
--NULL NULL
-SELECT i, SUM(i), (SELECT (SELECT SUM(i)+SUM(i1.i)+SUM(i2.i) FROM integers)
FROM integers i2) FROM integers i1 GROUP BY i ORDER BY i;
+SELECT i, CAST(SUM(i) AS BIGINT), CAST((SELECT (SELECT
SUM(i)+SUM(i1.i)+SUM(i2.i) FROM integers) FROM integers i2) AS BIGINT) FROM
integers i1 GROUP BY i ORDER BY i;
--1 1 13
--2 2 14
--3 3 15
@@ -602,7 +602,7 @@ SELECT i, CAST((SELECT SUM(ss2.i) FROM (
--3 3
--NULL NULL
-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;
+SELECT i, CAST((SELECT SUM(s1.i) FROM integers s1 LEFT OUTER JOIN integers s2
ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS BIGINT) AS j FROM integers i1
ORDER BY i;
--1 6
--2 6
--3 6
@@ -650,7 +650,7 @@ SELECT i, CAST((SELECT SUM(s2.i) FROM in
--3 3
--NULL NULL
-SELECT i, (SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE WHEN
(i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE false
END) ss2) AS j FROM integers i1 ORDER BY i;
+SELECT i, CAST((SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE
WHEN (i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE
false END) ss2) AS BIGINT) AS j FROM integers i1 ORDER BY i;
--1 1
--2 2
--3 3
@@ -686,7 +686,7 @@ SELECT i, CAST((SELECT SUM(ss2.i) FROM (
--3 6
--NULL 6
-SELECT i, (SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE WHEN
(i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE false
END) ss2) AS j FROM integers i1 ORDER BY i;
+SELECT i, CAST((SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE
WHEN (i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE
false END) ss2) AS BIGINT) AS j FROM integers i1 ORDER BY i;
--1 1
--2 2
--3 3
@@ -739,8 +739,8 @@ SELECT i, CAST((SELECT SUM(ss1.i)+SUM(ss
--3 6
--NULL NULL
-SELECT i, (SELECT SUM(ss1.i)+SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE
i=i1.i AND i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1 LEFT OUTER JOIN
- (SELECT i FROM integers s1 WHERE i<>i1.i OR i=ANY(SELECT i FROM
integers WHERE i=s1.i)) ss2 ON ss1.i=ss2.i) AS j FROM integers i1 ORDER BY i;
+SELECT i, CAST((SELECT SUM(ss1.i)+SUM(ss2.i) FROM (SELECT i FROM integers s1
WHERE i=i1.i AND i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1 LEFT OUTER
JOIN
+ (SELECT i FROM integers s1 WHERE i<>i1.i OR 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;
--1 NULL
--2 4
--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
@@ -820,10 +820,10 @@ stdout of test 'correlated` in directory
[ 1, 49 ]
[ 2, 50 ]
[ 3, 51 ]
-#SELECT i, (SELECT ((SELECT ((SELECT ((SELECT
SUM(i)+SUM(i4.i)+SUM(i3.i)+SUM(i2.i)+SUM(i1.i) FROM integers i5)) FROM integers
i4)) FROM integers i3)) FROM integers i2) AS j FROM integers i1 GROUP BY i
ORDER BY i;
-% .i1, .%6 # table_name
+#SELECT i, CAST((SELECT ((SELECT ((SELECT ((SELECT
SUM(i)+SUM(i4.i)+SUM(i3.i)+SUM(i2.i)+SUM(i1.i) FROM integers i5)) FROM integers
i4)) FROM integers i3)) FROM integers i2) AS BIGINT) AS j FROM integers i1
GROUP BY i ORDER BY i;
+% .i1, . # table_name
% i, j # name
-% int, hugeint # type
+% int, bigint # type
% 1, 2 # length
[ NULL, NULL ]
[ 1, 25 ]
@@ -838,19 +838,19 @@ 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, .%5 # table_name
+#SELECT i, CAST((SELECT SUM(s1.i) FROM integers s1 INNER JOIN integers s2 ON
(SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS BIGINT) AS j FROM integers i1 ORDER
BY i;
+% .i1, . # table_name
% i, j # name
-% int, hugeint # type
+% int, bigint # type
% 1, 1 # length
[ NULL, NULL ]
[ 1, 6 ]
[ 2, 6 ]
[ 3, 6 ]
-#SELECT i, SUM(i), (SELECT (SELECT SUM(i)+SUM(i1.i)+SUM(i2.i) FROM integers)
FROM integers i2) FROM integers i1 GROUP BY i ORDER BY i;
-% .i1, .%1, .%5 # table_name
-% i, %1, %6 # name
-% int, hugeint, hugeint # type
+#SELECT i, CAST(SUM(i) AS BIGINT), CAST((SELECT (SELECT
SUM(i)+SUM(i1.i)+SUM(i2.i) FROM integers) FROM integers i2) AS BIGINT) FROM
integers i1 GROUP BY i ORDER BY i;
+% .i1, .%2, .%10 # table_name
+% i, %2, %10 # name
+% int, bigint, bigint # type
% 1, 1, 2 # length
[ NULL, NULL, NULL ]
[ 1, 1, 13 ]
@@ -874,10 +874,10 @@ 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, .%5 # table_name
+#SELECT i, CAST((SELECT SUM(s1.i) FROM integers s1 LEFT OUTER JOIN integers s2
ON (SELECT i1.i+s1.i)=(SELECT i1.i+s2.i)) AS BIGINT) AS j FROM integers i1
ORDER BY i;
+% .i1, . # table_name
% i, j # name
-% int, hugeint # type
+% int, bigint # type
% 1, 1 # length
[ NULL, 6 ]
[ 1, 6 ]
@@ -946,10 +946,10 @@ stdout of test 'correlated` in directory
[ 1, 5 ]
[ 2, 4 ]
[ 3, 3 ]
-#SELECT i, (SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE WHEN
(i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE false
END) ss2) AS j FROM integers i1 ORDER BY i;
-% .i1, .%2 # table_name
+#SELECT i, CAST((SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE
WHEN (i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE
false END) ss2) AS BIGINT) AS j FROM integers i1 ORDER BY i;
+% .i1, . # table_name
% i, j # name
-% int, hugeint # type
+% int, bigint # type
% 1, 1 # length
[ NULL, NULL ]
[ 1, 1 ]
@@ -1000,10 +1000,10 @@ stdout of test 'correlated` in directory
[ 1, 6 ]
[ 2, 6 ]
[ 3, 6 ]
-#SELECT i, (SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE WHEN
(i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE false
END) ss2) AS j FROM integers i1 ORDER BY i;
-% .i1, .%2 # table_name
+#SELECT i, CAST((SELECT SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE CASE
WHEN (i=i1.i AND i=ANY(SELECT i FROM integers WHERE i=s1.i)) THEN true ELSE
false END) ss2) AS BIGINT) AS j FROM integers i1 ORDER BY i;
+% .i1, . # table_name
% i, j # name
-% int, hugeint # type
+% int, bigint # type
% 1, 1 # length
[ NULL, NULL ]
[ 1, 1 ]
@@ -1077,11 +1077,11 @@ stdout of test 'correlated` in directory
[ 1, NULL ]
[ 2, 4 ]
[ 3, 6 ]
-#SELECT i, (SELECT SUM(ss1.i)+SUM(ss2.i) FROM (SELECT i FROM integers s1 WHERE
i=i1.i AND i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1 LEFT OUTER JOIN
-# (SELECT i FROM integers s1 WHERE i<>i1.i OR i=ANY(SELECT i FROM
integers WHERE i=s1.i)) ss2 ON ss1.i=ss2.i) AS j FROM integers i1 ORDER BY i;
-% .i1, .%7 # table_name
+#SELECT i, CAST((SELECT SUM(ss1.i)+SUM(ss2.i) FROM (SELECT i FROM integers s1
WHERE i=i1.i AND i>ANY(SELECT i FROM integers WHERE i<>s1.i)) ss1 LEFT OUTER
JOIN
+# (SELECT i FROM integers s1 WHERE i<>i1.i OR 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
-% int, hugeint # type
+% int, bigint # type
% 1, 1 # length
[ NULL, NULL ]
[ 1, NULL ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
