Changeset: 5332be933181 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5332be933181
Modified Files:
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out
sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
Branch: Jun2020-mmt
Log Message:
Test approvals.
diffs (280 lines):
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
@@ -84,6 +84,7 @@ stdout of test 'CrashMe_SQL_server_crash
[ NULL, "sys", "objects", "id", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 1, NULL, NULL,
NULL ]
[ NULL, "sys", "objects", "name", "varchar", 1024, 0,
0, 10, NULL, NULL, NULL, 0, 0, 0, 2, NULL,
NULL, NULL ]
[ NULL, "sys", "objects", "nr", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 3, NULL, NULL,
NULL ]
+[ NULL, "sys", "objects", "sub", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 4, NULL, NULL,
NULL ]
[ NULL, "sys", "sequences", "id", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 1, NULL, NULL,
NULL ]
[ NULL, "sys", "sequences", "schema_id", "int", 32, 0,
0, 10, NULL, NULL, NULL, 0, 0, 0, 2, NULL,
NULL, NULL ]
[ NULL, "sys", "sequences", "name", "varchar", 256, 0,
0, 10, NULL, NULL, NULL, 0, 0, 0, 3, NULL,
NULL, NULL ]
@@ -102,6 +103,7 @@ stdout of test 'CrashMe_SQL_server_crash
[ NULL, "tmp", "objects", "id", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 1, NULL, NULL,
NULL ]
[ NULL, "tmp", "objects", "name", "varchar", 1024, 0,
0, 10, NULL, NULL, NULL, 0, 0, 0, 2, NULL,
NULL, NULL ]
[ NULL, "tmp", "objects", "nr", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 3, NULL, NULL,
NULL ]
+[ NULL, "tmp", "objects", "sub", "int", 32, 0, 0,
10, NULL, NULL, NULL, 0, 0, 0, 4, NULL, NULL,
NULL ]
# 14:57:01 >
# 14:57:01 > Done.
diff --git
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
---
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
+++
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
@@ -30,10 +30,10 @@ stdout of test 'ORDER_BY_evaluation_erro
# AND "tables"."schema_id" = "schemas"."id"
# AND "tables"."system" = FALSE
# AND "keys"."type" = 0;
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas,
.schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action, access,
temporary, id, name, authorization, owner, system # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 1, 1, 1, 0,
1, 1, 5 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .objects, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .schemas, .schemas, .schemas,
.schemas, .schemas # table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
sub, id, name, schema_id, query, type, system, commit_action,
access, temporary, id, name, authorization, owner, system # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 1, 1, 1,
0, 1, 1, 5 # length
#SELECT *
#FROM "keys", "objects", "tables", "schemas"
#WHERE "keys"."id" = "objects"."id"
@@ -42,12 +42,12 @@ stdout of test 'ORDER_BY_evaluation_erro
# AND "tables"."system" = FALSE
# AND "keys"."type" = 0
#ORDER BY "objects"."name";
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas,
.schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action, access,
temporary, id, name, authorization, owner, system # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 1, 1, 1, 0,
1, 1, 5 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .objects, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .schemas, .schemas, .schemas,
.schemas, .schemas # table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
sub, id, name, schema_id, query, type, system, commit_action,
access, temporary, id, name, authorization, owner, system # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 1, 1, 1,
0, 1, 1, 5 # length
-# 10:35:10 >
-# 10:35:10 > "Done."
-# 10:35:10 >
+# 21:05:11 >
+# 21:05:11 > "Done."
+# 21:05:11 >
diff --git
a/sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
b/sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
---
a/sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
+++
b/sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
@@ -30,7 +30,7 @@ stdout of test 'groupby_having_orderby_c
% type, %1 # name
% varchar, bigint # type
% 8, 2 # length
-[ "int", 19 ]
+[ "int", 20 ]
[ "varchar", 14 ]
[ "smallint", 6 ]
#SELECT type,COUNT(id) FROM cols_6624 GROUP BY type HAVING COUNT(id)>5 ORDER
BY 2 DESC;
@@ -38,7 +38,7 @@ stdout of test 'groupby_having_orderby_c
% type, %1 # name
% varchar, bigint # type
% 8, 2 # length
-[ "int", 19 ]
+[ "int", 20 ]
[ "varchar", 14 ]
[ "smallint", 6 ]
#SELECT type,COUNT(id) as cnt FROM cols_6624 GROUP BY type HAVING COUNT(id)>5
ORDER BY cnt DESC;
@@ -46,7 +46,7 @@ stdout of test 'groupby_having_orderby_c
% type, cnt # name
% varchar, bigint # type
% 8, 2 # length
-[ "int", 19 ]
+[ "int", 20 ]
[ "varchar", 14 ]
[ "smallint", 6 ]
#DROP TABLE cols_6624;
diff --git
a/sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out
b/sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out
--- a/sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out
+++ b/sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out
@@ -40,10 +40,10 @@ stdout of test 'alter_table_set_schema.B
% int, int, int, varchar, int, int # type
% 1, 1, 1, 0, 1, 1 # length
#SELECT * FROM sys.objects WHERE id NOT IN (SELECT id FROM sys.ids);
-% sys.objects, sys.objects, sys.objects # table_name
-% id, name, nr # name
-% int, varchar, int # type
-% 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects # table_name
+% id, name, nr, sub # name
+% int, varchar, int, int # type
+% 1, 0, 1, 1 # length
#SELECT * FROM sys.idxs WHERE table_id NOT IN (SELECT id FROM sys.tables);
% sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name
% id, table_id, type, name # name
@@ -151,10 +151,10 @@ stdout of test 'alter_table_set_schema.B
% int, int, int, varchar, int, int # type
% 1, 1, 1, 0, 1, 1 # length
#SELECT * FROM sys.objects WHERE id NOT IN (SELECT id FROM sys.ids);
-% sys.objects, sys.objects, sys.objects # table_name
-% id, name, nr # name
-% int, varchar, int # type
-% 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects # table_name
+% id, name, nr, sub # name
+% int, varchar, int, int # type
+% 1, 0, 1, 1 # length
#SELECT * FROM sys.idxs WHERE table_id NOT IN (SELECT id FROM sys.tables);
% sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name
% id, table_id, type, name # name
@@ -187,10 +187,10 @@ stdout of test 'alter_table_set_schema.B
% int, int, int, varchar, int, int # type
% 1, 1, 1, 0, 1, 1 # length
#SELECT * FROM sys.objects WHERE id NOT IN (SELECT id FROM sys.ids);
-% sys.objects, sys.objects, sys.objects # table_name
-% id, name, nr # name
-% int, varchar, int # type
-% 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects # table_name
+% id, name, nr, sub # name
+% int, varchar, int, int # type
+% 1, 0, 1, 1 # length
#SELECT * FROM sys.idxs WHERE table_id NOT IN (SELECT id FROM sys.tables);
% sys.idxs, sys.idxs, sys.idxs, sys.idxs # table_name
% id, table_id, type, name # name
diff --git a/sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
b/sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
--- a/sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
+++ b/sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out
@@ -30,8 +30,8 @@ stdout of test 'groupby_having-bug-sf-94
# 'objects', 'keys', 'modules', 'sequences') AND
# b.name IN ('args', 'columns', 'functions', 'idxs',
# 'objects', 'keys', 'modules', 'sequences')
-% .a, .b, .%51 # table_name
-% name, name, %51 # name
+% .a, .b, .%55 # table_name
+% name, name, %55 # name
% varchar, varchar, bigint # type
% 9, 9, 2 # length
[ "args", "columns", 6 ]
@@ -56,7 +56,7 @@ stdout of test 'groupby_having-bug-sf-94
[ "objects", "columns", 4 ]
[ "objects", "idxs", 2 ]
[ "objects", "keys", 2 ]
-[ "objects", "objects", 3 ]
+[ "objects", "objects", 4 ]
[ "sequences", "columns", 2 ]
[ "sequences", "idxs", 4 ]
[ "sequences", "keys", 4 ]
diff --git a/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
b/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
--- a/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
+++ b/sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
@@ -80,6 +80,7 @@ stdout of test 'innerjoin_multiple-bug-s
[ "sys", "objects", "id" ]
[ "sys", "objects", "name" ]
[ "sys", "objects", "nr" ]
+[ "sys", "objects", "sub" ]
[ "sys", "sequences", "cacheinc" ]
[ "sys", "sequences", "cycle" ]
[ "sys", "sequences", "id" ]
@@ -102,6 +103,7 @@ stdout of test 'innerjoin_multiple-bug-s
[ "tmp", "objects", "id" ]
[ "tmp", "objects", "name" ]
[ "tmp", "objects", "nr" ]
+[ "tmp", "objects", "sub" ]
#select s.name, t.name, c.name from
# columns c
# inner join
@@ -159,6 +161,7 @@ stdout of test 'innerjoin_multiple-bug-s
[ "sys", "objects", "id" ]
[ "sys", "objects", "name" ]
[ "sys", "objects", "nr" ]
+[ "sys", "objects", "sub" ]
[ "sys", "sequences", "cacheinc" ]
[ "sys", "sequences", "cycle" ]
[ "sys", "sequences", "id" ]
@@ -181,6 +184,7 @@ stdout of test 'innerjoin_multiple-bug-s
[ "tmp", "objects", "id" ]
[ "tmp", "objects", "name" ]
[ "tmp", "objects", "nr" ]
+[ "tmp", "objects", "sub" ]
# 15:05:59 >
# 15:05:59 > Done.
diff --git a/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
b/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
--- a/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
+++ b/sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out
@@ -30,10 +30,10 @@ stdout of test 'select_orderby_alias-bug
#AND "tables"."schema_id" = "schemas"."id" AND
#"keys"."type" = 0 AND "schemas"."name" LIKE 'sys' AND
#"tables"."name" LIKE 'x';
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas,
.schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action, access,
temporary, id, name, authorization, owner, system # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 1, 1, 1, 0,
1, 1, 5 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .objects, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .schemas, .schemas, .schemas,
.schemas, .schemas # table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
sub, id, name, schema_id, query, type, system, commit_action,
access, temporary, id, name, authorization, owner, system # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 1, 1, 1,
0, 1, 1, 5 # length
#SELECT * FROM "sys"."keys" AS "keys", "sys"."objects" AS
#"objects", "sys"."tables" AS "tables",
#"sys"."schemas" AS "schemas" WHERE "keys"."id" =
@@ -41,10 +41,10 @@ stdout of test 'select_orderby_alias-bug
#AND "tables"."schema_id" = "schemas"."id" AND
#"keys"."type" = 0 AND "schemas"."name" LIKE 'sys' AND
#"tables"."name" LIKE 'x' ORDER BY "objects"."name";
-% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .schemas, .schemas, .schemas, .schemas,
.schemas # table_name
-% id, table_id, type, name, rkey, action, id, name, nr,
id, name, schema_id, query, type, system, commit_action, access,
temporary, id, name, authorization, owner, system # name
-% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
-% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 1, 1, 1, 0,
1, 1, 5 # length
+% .keys, .keys, .keys, .keys, .keys, .keys, .objects,
.objects, .objects, .objects, .tables, .tables,
.tables, .tables, .tables, .tables, .tables,
.tables, .tables, .schemas, .schemas, .schemas,
.schemas, .schemas # table_name
+% id, table_id, type, name, rkey, action, id, name, nr,
sub, id, name, schema_id, query, type, system, commit_action,
access, temporary, id, name, authorization, owner, system # name
+% int, int, int, varchar, int, int, int, varchar,
int, int, int, varchar, int, varchar, smallint,
boolean, smallint, smallint, tinyint, int,
varchar, int, int, boolean # type
+% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
1, 0, 1, 0, 1, 5, 1, 1, 1, 1,
0, 1, 1, 5 # length
#SELECT cast(null AS varchar(1)) AS "TABLE_CAT",
#"schemas"."name" AS "TABLE_SCHEM", "tables"."name" AS
#"TABLE_NAME", "objects"."name" AS "COLUMN_NAME",
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
---
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
+++
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
@@ -134,10 +134,10 @@ stdout of test 'check_ForeignKey_referen
% int, varchar, varchar, int, int, int, int, int #
type
% 1, 0, 0, 1, 1, 1, 1, 1 # length
#SELECT * FROM sys.objects WHERE id NOT IN (SELECT id FROM sys.ids);
-% sys.objects, sys.objects, sys.objects # table_name
-% id, name, nr # name
-% int, varchar, int # type
-% 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects # table_name
+% id, name, nr, sub # name
+% int, varchar, int, int # type
+% 1, 0, 1, 1 # length
#SELECT * FROM sys.ids WHERE obj_type IN ('key', 'index') AND id NOT IN
(SELECT id FROM sys.objects);
% .ids, .ids, .ids, .ids, .ids, .ids, .ids # table_name
% id, name, schema_id, table_id, table_name, obj_type,
sys_table # name
diff --git a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
--- a/sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
+++ b/sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
@@ -434,20 +434,20 @@ stdout of test 'check_Not_Nullable_colum
% int, int, int, int, varchar, int, int # type
% 1, 1, 1, 1, 0, 1, 1 # length
#SELECT "id", * FROM "sys"."objects" WHERE "id" IS NULL;
-% sys.objects, sys.objects, sys.objects, sys.objects # table_name
-% id, id, name, nr # name
-% int, int, varchar, int # type
-% 1, 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects, sys.objects #
table_name
+% id, id, name, nr, sub # name
+% int, int, varchar, int, int # type
+% 1, 1, 0, 1, 1 # length
#SELECT "name", * FROM "sys"."objects" WHERE "name" IS NULL;
-% sys.objects, sys.objects, sys.objects, sys.objects # table_name
-% name, id, name, nr # name
-% varchar, int, varchar, int # type
-% 0, 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects, sys.objects #
table_name
+% name, id, name, nr, sub # name
+% varchar, int, varchar, int, int # type
+% 0, 1, 0, 1, 1 # length
#SELECT "nr", * FROM "sys"."objects" WHERE "nr" IS NULL;
-% sys.objects, sys.objects, sys.objects, sys.objects # table_name
-% nr, id, name, nr # name
-% int, int, varchar, int # type
-% 1, 1, 0, 1 # length
+% sys.objects, sys.objects, sys.objects, sys.objects, sys.objects #
table_name
+% nr, id, name, nr, sub # name
+% int, int, varchar, int, int # type
+% 1, 1, 0, 1, 1 # length
#SELECT "obj_id", * FROM "sys"."privileges" WHERE "obj_id" IS NULL;
% sys.privileges, sys.privileges, sys.privileges, sys.privileges,
sys.privileges, sys.privileges # table_name
% obj_id, obj_id, auth_id, privileges, grantor,
grantable # name
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
