Changeset: ef4f38b67406 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef4f38b67406 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 Branch: sq2default Log Message:
Approved output diffs (99 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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list