Changeset: 0b0d0977dbad for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b0d0977dbad Modified Files: sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out Branch: mosaic Log Message:
Fix test output after last merge with dfault. diffs (197 lines): diff --git a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out --- a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out +++ b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out @@ -80,7 +80,7 @@ Ready. [ "sys", 2000, "rejects", true, 4 ] [ "sys", 2000, "roles", true, 3 ] [ "sys", 2000, "var_values", true, 2 ] -[ "sys", 2000, "storage", true, 17 ] +[ "sys", 2000, "storage", true, 18 ] [ "sys", 2000, "tablestorage", true, 9 ] [ "sys", 2000, "schemastorage", true, 7 ] [ "sys", 2000, "storagemodel", true, 13 ] @@ -133,7 +133,7 @@ Ready. [ "sys", 2000, "rejects", true, 4 ] [ "sys", 2000, "roles", true, 3 ] [ "sys", 2000, "var_values", true, 2 ] -[ "sys", 2000, "storage", true, 17 ] +[ "sys", 2000, "storage", true, 18 ] [ "sys", 2000, "tablestorage", true, 9 ] [ "sys", 2000, "schemastorage", true, 7 ] [ "sys", 2000, "storagemodel", true, 13 ] 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 @@ -390,55 +390,55 @@ Ready. % int, clob, int, timestamp, bigint, bigint, bigint, bigint, clob, clob, boolean, boolean # type % 1, 0, 1, 26, 1, 1, 1, 1, 0, 0, 5, 5 # length #SELECT * FROM sys.storage() WHERE schema NOT IN (SELECT name FROM sys.schemas); -% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage() WHERE table NOT IN (SELECT name FROM sys._tables UNION ALL SELECT name FROM tmp._tables); -% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage() WHERE (schema, table) NOT IN (SELECT sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id = tbl.schema_id); -% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage() WHERE column NOT IN (SELECT name FROM sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION ALL SELECT name FROM tmp.idxs); -% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage() WHERE type NOT IN (SELECT sqlname FROM sys.types); -% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1, .L1 # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage WHERE schema NOT IN (SELECT name FROM sys.schemas); % .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name % schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name % varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type % 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage WHERE table NOT IN (SELECT name FROM sys._tables UNION ALL SELECT name FROM tmp._tables); -% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage WHERE (schema, table) NOT IN (SELECT sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id = tbl.schema_id); -% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage WHERE column NOT IN (SELECT name FROM sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION ALL SELECT name FROM tmp.idxs); -% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.storage WHERE type NOT IN (SELECT sqlname FROM sys.types); -% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name -% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx # name -% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint # type -% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1 # length +% .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage, .storage # table_name +% schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, revsorted, unique, orderidx, compressed # name +% varchar, varchar, varchar, varchar, varchar, varchar, bigint, int, bigint, bigint, bigint, boolean, bigint, boolean, boolean, boolean, bigint, boolean # type +% 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 5, 1, 5, 5, 5, 1, 5 # length #SELECT * FROM sys.tablestorage WHERE schema NOT IN (SELECT name FROM sys.schemas); % .tablestorage, .tablestorage, .tablestorage, .tablestorage, .tablestorage, .tablestorage, .tablestorage, .tablestorage, .tablestorage # table_name % schema, table, rowcount, storages, columnsize, heapsize, hashsize, imprintsize, orderidxsize # name @@ -485,30 +485,30 @@ Ready. % varchar, varchar, varchar, varchar, bigint, bigint, bigint, bigint, bigint, bigint, boolean, boolean, boolean # type % 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 5, 5, 5 # length #SELECT * FROM sys.storagemodelinput WHERE schema NOT IN (SELECT name FROM sys.schemas); -% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name -% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn # name -% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean # type -% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5 # length +% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name +% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn, compressed # name +% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean, boolean # type +% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5, 5 # length #SELECT * FROM sys.storagemodelinput WHERE table NOT IN (SELECT name FROM sys._tables UNION ALL SELECT name FROM tmp._tables); -% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name -% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn # name -% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean # type -% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5 # length +% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name +% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn, compressed # name +% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean, boolean # type +% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5, 5 # length #SELECT * FROM sys.storagemodelinput WHERE (schema, table) NOT IN (SELECT sch.name, tbl.name FROM sys.schemas AS sch JOIN sys.tables AS tbl ON sch.id = tbl.schema_id); -% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name -% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn # name -% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean # type -% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5 # length +% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name +% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn, compressed # name +% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean, boolean # type +% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5, 5 # length #SELECT * FROM sys.storagemodelinput WHERE column NOT IN (SELECT name FROM sys._columns UNION ALL SELECT name FROM tmp._columns UNION ALL SELECT name FROM sys.keys UNION ALL SELECT name FROM tmp.keys UNION ALL SELECT name FROM sys.idxs UNION ALL SELECT name FROM tmp.idxs); -% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name -% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn # name -% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean # type -% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5 # length +% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name +% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn, compressed # name +% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean, boolean # type +% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5, 5 # length #SELECT * FROM sys.storagemodelinput WHERE type NOT IN (SELECT sqlname FROM sys.types); -% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name -% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn # name -% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean # type -% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5 # length +% sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput, sys.storagemodelinput # table_name +% schema, table, column, type, typewidth, count, distinct, atomwidth, reference, sorted, unique, isacolumn, compressed # name +% varchar, varchar, varchar, varchar, int, bigint, bigint, int, boolean, boolean, boolean, boolean, boolean # type +% 0, 0, 0, 0, 1, 1, 1, 1, 5, 5, 5, 5, 5 # length #SELECT schema, table, rowcount, columnsize, heapsize, hashsize, imprintsize, orderidxsize FROM sys.tablestoragemodel WHERE schema NOT IN (SELECT name FROM sys.schemas); % sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel, sys.tablestoragemodel # table_name % schema, table, rowcount, columnsize, heapsize, hashsize, imprintsize, orderidxsize # name 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 @@ -80,7 +80,7 @@ Ready. % bigint, int # type % 1, 1 # length #SELECT COUNT(*) AS duplicates, function_id FROM sys.systemfunctions GROUP BY function_id HAVING COUNT(*) > 1; -% sys.L3, sys.systemfunctions # table_name +% sys.L7, sys.systemfunctions # table_name % duplicates, function_id # name % bigint, int # type % 1, 1 # length @@ -245,7 +245,7 @@ Ready. % bigint, bigint # type % 1, 1 # length #SELECT COUNT(*) AS duplicates, schema, table, column FROM sys.storage GROUP BY schema, table, column HAVING COUNT(*) > 1; -% .L11, .storage, .storage, .storage # table_name +% .L113, .storage, .storage, .storage # table_name % duplicates, schema, table, column # name % bigint, varchar, varchar, varchar # type % 1, 0, 0, 0 # length @@ -260,7 +260,7 @@ Ready. % bigint, varchar, varchar, varchar # type % 1, 0, 0, 0 # length #SELECT COUNT(*) AS duplicates, schema, table FROM sys.tablestoragemodel GROUP BY schema, table HAVING COUNT(*) > 1; -% sys.L42, sys.tablestoragemodel, sys.tablestoragemodel # table_name +% sys.L36, sys.tablestoragemodel, sys.tablestoragemodel # table_name % duplicates, schema, table # name % bigint, varchar, varchar # type % 1, 0, 0 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
