Changeset: 23317a9961b7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23317a9961b7 Modified Files: sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out Branch: Oct2020 Log Message:
Correcting validation queries diffs (90 lines): diff --git a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql --- a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql +++ b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql @@ -20,7 +20,7 @@ SELECT COUNT(*) AS duplicates, T.id FROM -- the next query returns duplicates for overloaded functions (same function but with different args), hence it has been disabled --SELECT COUNT(*) AS duplicates, schema_id, name, func, mod, language, type, side_effect, varres, vararg FROM sys.functions -- GROUP BY schema_id, name, func, mod, language, type, side_effect, varres, vararg HAVING COUNT(*) > 1; -SELECT COUNT(*) AS duplicates, func_id, name FROM sys.args GROUP BY func_id, name HAVING COUNT(*) > 1; +SELECT COUNT(*) AS duplicates, func_id, name, inout FROM sys.args GROUP BY func_id, name, inout HAVING COUNT(*) > 1; SELECT COUNT(*) AS duplicates, schema_id, systemname, sqlname FROM sys.types GROUP BY schema_id, systemname, sqlname HAVING COUNT(*) > 1; diff --git a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out --- a/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out +++ b/sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out @@ -88,11 +88,11 @@ stdout of test 'check_AlternateKey_uniqu % duplicates, id # name % bigint, int # type % 1, 1 # length -#SELECT COUNT(*) AS duplicates, func_id, name FROM sys.args GROUP BY func_id, name HAVING COUNT(*) > 1; -% sys., sys.args, sys.args # table_name -% duplicates, func_id, name # name -% bigint, int, varchar # type -% 1, 1, 0 # length +#SELECT COUNT(*) AS duplicates, func_id, name, inout FROM sys.args GROUP BY func_id, name, inout HAVING COUNT(*) > 1; +% sys., sys.args, sys.args, sys.args # table_name +% duplicates, func_id, name, inout # name +% bigint, int, varchar, tinyint # type +% 1, 1, 0, 1 # length #SELECT COUNT(*) AS duplicates, schema_id, systemname, sqlname FROM sys.types GROUP BY schema_id, systemname, sqlname HAVING COUNT(*) > 1; % sys., sys.types, sys.types, sys.types # table_name % duplicates, schema_id, systemname, sqlname # name diff --git a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql --- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql +++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql @@ -16,7 +16,7 @@ SELECT * FROM sys._columns WHERE table_i SELECT * FROM tmp._columns WHERE table_id NOT IN (SELECT id FROM tmp._tables); SELECT * FROM sys.columns WHERE type NOT IN (SELECT sqlname FROM sys.types); SELECT * FROM sys._columns WHERE type NOT IN (SELECT sqlname FROM sys.types); -SELECT * FROM sys._columns WHERE type NOT IN (SELECT sqlname FROM sys.types); +SELECT * FROM tmp._columns WHERE type NOT IN (SELECT sqlname FROM sys.types); SELECT * FROM sys.functions WHERE schema_id NOT IN (SELECT id FROM sys.schemas); SELECT * FROM sys.functions WHERE type NOT IN (SELECT function_type_id FROM sys.function_types); 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 @@ -88,8 +88,8 @@ stdout of test 'check_ForeignKey_referen % id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length -#SELECT * FROM sys._columns WHERE type NOT IN (SELECT sqlname FROM sys.types); -% sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns, sys._columns # table_name +#SELECT * FROM tmp._columns WHERE type NOT IN (SELECT sqlname FROM sys.types); +% tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns, tmp._columns # table_name % id, name, type, type_digits, type_scale, table_id, default, null, number, storage # name % int, varchar, varchar, int, int, int, varchar, boolean, int, varchar # type % 1, 0, 0, 1, 1, 1, 0, 5, 1, 0 # length diff --git a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql --- a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql +++ b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql @@ -44,7 +44,7 @@ SELECT COUNT(*) AS duplicates, name FROM SELECT COUNT(*) AS duplicates, login_id, role_id FROM sys.user_role GROUP BY login_id, role_id HAVING COUNT(*) > 1; SELECT COUNT(*) AS duplicates, privilege_code_id FROM sys.privilege_codes GROUP BY privilege_code_id HAVING COUNT(*) > 1; -SELECT COUNT(*) AS duplicates, obj_id, auth_id FROM sys.privileges GROUP BY obj_id, auth_id HAVING COUNT(*) > 1; +SELECT COUNT(*) AS duplicates, obj_id, auth_id, privileges FROM sys.privileges GROUP BY obj_id, auth_id, privileges HAVING COUNT(*) > 1; SELECT COUNT(*) AS duplicates, id FROM sys.querylog_catalog GROUP BY id HAVING COUNT(*) >1; SELECT COUNT(*) AS duplicates, id FROM sys.querylog_calls GROUP BY id HAVING COUNT(*) > 1; diff --git a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out --- a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out +++ b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out @@ -188,11 +188,11 @@ stdout of test 'check_PrimaryKey_uniquen % duplicates, privilege_code_id # name % bigint, int # type % 1, 1 # length -#SELECT COUNT(*) AS duplicates, obj_id, auth_id FROM sys.privileges GROUP BY obj_id, auth_id HAVING COUNT(*) > 1; -% sys., sys.privileges, sys.privileges # table_name -% duplicates, obj_id, auth_id # name -% bigint, int, int # type -% 1, 1, 1 # length +#SELECT COUNT(*) AS duplicates, obj_id, auth_id, privileges FROM sys.privileges GROUP BY obj_id, auth_id, privileges HAVING COUNT(*) > 1; +% sys., sys.privileges, sys.privileges, sys.privileges # table_name +% duplicates, obj_id, auth_id, privileges # name +% bigint, int, int, int # type +% 1, 1, 1, 1 # length #SELECT COUNT(*) AS duplicates, id FROM sys.querylog_catalog GROUP BY id HAVING COUNT(*) >1; % ., .querylog_catalog # table_name % duplicates, id # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
