Changeset: a21479c43794 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a21479c43794 Modified Files: sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: wlcrNov2019 Log Message:
Approved output diffs (truncated from 1515 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out --- a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out @@ -35,6 +35,8 @@ stdout of test 'table_functions_fail_aft [ "tmp" ] [ "json" ] [ "profiler" ] +[ "wlc" ] +[ "wlr" ] [ "bam" ] [ "ft" ] diff --git a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out --- a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out +++ b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out @@ -31,6 +31,8 @@ stdout of test 'table_functions_fail_aft [ "tmp" ] [ "json" ] [ "profiler" ] +[ "wlc" ] +[ "wlr" ] [ "bam" ] [ "ft" ] #drop function ft.func; diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out b/sql/test/Dependencies/Tests/Dependencies.stable.out --- a/sql/test/Dependencies/Tests/Dependencies.stable.out +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out @@ -74,16 +74,16 @@ Dependencies between database objects #CREATE TABLE t3 (id int); #CREATE TRIGGER trigger_test_4 AFTER INSERT ON t1 # INSERT INTO t3 values(1); -#SELECT s.name, u.name, 'DEP_USER' from schemas as s, users u where u.default_schema = s.id; -% sys.s, .u, .L11 # table_name -% name, name, L11 # name +#SELECT s.name, u.name, 'DEP_USER' from schemas as s, users u where u.default_schema = s.id order by s.name, u.name; +% sys.s, .u, .L5 # table_name +% name, name, L5 # name % varchar, varchar, char # type % 4, 10, 8 # length [ "sys", "monetdb", "DEP_USER" ] [ "test", "monet_test", "DEP_USER" ] -#SELECT a.name, s.name, 'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id; -% sys.a, sys.s, .L4 # table_name -% name, name, L4 # name +#SELECT a.name, s.name, 'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id order by a.name, s.name; +% sys.a, sys.s, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 7, 8, 10 # length [ "monetdb", "bam", "DEP_SCHEMA" ] @@ -92,22 +92,24 @@ Dependencies between database objects [ "monetdb", "sys", "DEP_SCHEMA" ] [ "monetdb", "test", "DEP_SCHEMA" ] [ "monetdb", "tmp", "DEP_SCHEMA" ] +[ "monetdb", "wlc", "DEP_SCHEMA" ] +[ "monetdb", "wlr", "DEP_SCHEMA" ] #SELECT t.name, v.name, 'DEP_VIEW' from tables as t, tables as v, dependencies as dep where t.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type = 1 order by t.name, v.name; -% .t, .v, .L100 # table_name -% name, name, L100 # name +% .t, .v, .L31 # table_name +% name, name, L31 # name % varchar, varchar, char # type % 2, 2, 8 # length [ "t1", "v1", "DEP_VIEW" ] [ "v1", "v2", "DEP_VIEW" ] #SELECT t.name, i.name, 'DEP_INDEX' from tables as t, idxs as i where i.table_id = t.id and i.name not in (select name from keys) and t.type = 0 order by t.name, i.name; -% .t, .i, .L45 # table_name -% name, name, L45 # name +% .t, .i, .L16 # table_name +% name, name, L16 # name % varchar, varchar, char # type % 2, 8, 9 # length [ "t1", "id_index", "DEP_INDEX" ] -#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from tables as t, triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from triggers tri, tables t, dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8); -% .L115, .L115, .L115 # table_name -% name, trigname, L44 # name +#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from tables as t, triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from triggers tri, tables t, dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8) order by name, trigname; +% .L43, .L43, .L43 # table_name +% name, trigname, L17 # name % varchar, varchar, char # type % 7, 21, 11 # length [ "_tables", "system_update_tables", "DEP_TRIGGER" ] @@ -116,9 +118,9 @@ Dependencies between database objects [ "t1", "trigger_test_4", "DEP_TRIGGER" ] [ "t2", "trigger_test", "DEP_TRIGGER" ] [ "t3", "trigger_test_4", "DEP_TRIGGER" ] -#SELECT t.name, fk.name, 'DEP_FKEY' from tables as t, keys as k, keys as fk where fk.rkey = k.id and k.table_id = t.id; -% .t, .fk, .L42 # table_name -% name, name, L42 # name +#SELECT t.name, fk.name, 'DEP_FKEY' from tables as t, keys as k, keys as fk where fk.rkey = k.id and k.table_id = t.id order by t.name, fk.name; +% .t, .fk, .L15 # table_name +% name, name, L15 # name % varchar, varchar, char # type % 5, 15, 8 # length [ "files", "pg_fkey_file_id", "DEP_FKEY" ] @@ -126,23 +128,23 @@ Dependencies between database objects [ "files", "sq_fkey_file_id", "DEP_FKEY" ] [ "t1", "t2_id_t1_fkey", "DEP_FKEY" ] #SELECT t.name, f.name, 'DEP_FUNC' from functions as f, tables as t, dependencies as dep where t.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 AND t.type IN (0, 10) ORDER BY t.name, f.name; -% .t, .f, .L42 # table_name -% name, name, L42 # name +% .t, .f, .L15 # table_name +% name, name, L15 # name % varchar, varchar, char # type % 15, 8, 8 # length [ "spatial_ref_sys", "getproj4", "DEP_FUNC" ] [ "t1", "f2", "DEP_FUNC" ] #SELECT c.name, v.name, 'DEP_VIEW' from columns as c, tables as v, dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type = 1 order by c.name, v.name; -% .c, .v, .L55 # table_name -% name, name, L55 # name +% .c, .v, .L25 # table_name +% name, name, L25 # name % varchar, varchar, char # type % 4, 2, 8 # length [ "age", "v1", "DEP_VIEW" ] [ "id", "v1", "DEP_VIEW" ] [ "name", "v1", "DEP_VIEW" ] #SELECT c.name, k.name, 'DEP_KEY' from columns as c, objects as kc, keys as k where kc."name" = c.name AND kc.id = k.id AND k.table_id = c.table_id AND k.rkey = -1 order by c.name, k.name; -% .c, .k, .L17 # table_name -% name, name, L17 # name +% .c, .k, .L11 # table_name +% name, name, L11 # name % varchar, varchar, char # type % 20, 44, 7 # length [ "dependency_type_id", "dependency_types_dependency_type_id_pkey", "DEP_KEY" ] @@ -171,14 +173,14 @@ Dependencies between database objects [ "table_type_id", "table_types_table_type_id_pkey", "DEP_KEY" ] [ "table_type_name", "table_types_table_type_name_unique", "DEP_KEY" ] #SELECT c.name, i.name, 'DEP_INDEX' from columns as c, objects as kc, idxs as i where kc."name" = c.name AND kc.id = i.id AND c.table_id = i.table_id AND i.name not in (select name from keys) order by c.name, i.name; -% .c, .i, .L22 # table_name -% name, name, L22 # name +% .c, .i, .L12 # table_name +% name, name, L12 # name % varchar, varchar, char # type % 2, 8, 9 # length [ "id", "id_index", "DEP_INDEX" ] #SELECT c.name, f.name, 'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 ORDER BY c.name, f.name; -% .c, .f, .L17 # table_name -% name, name, L17 # name +% .c, .f, .L11 # table_name +% name, name, L11 # name % varchar, varchar, char # type % 9, 8, 8 # length [ "age", "f2", "DEP_FUNC" ] @@ -190,8 +192,8 @@ Dependencies between database objects [ "srid", "getproj4", "DEP_FUNC" ] [ "srtext", "getproj4", "DEP_FUNC" ] #SELECT c.name, tri.name, 'DEP_TRIGGER' from columns as c, triggers as tri, dependencies as dep where dep.id = c.id AND dep.depend_id =tri.id AND dep.depend_type = 8 order by c.name, tri.name; -% .c, .tri, .L17 # table_name -% name, name, L17 # name +% .c, .tri, .L11 # table_name +% name, name, L11 # name % varchar, varchar, char # type % 6, 14, 11 # length [ "age", "trigger_test", "DEP_TRIGGER" ] @@ -201,24 +203,24 @@ Dependencies between database objects [ "id_t1", "trigger_test", "DEP_TRIGGER" ] [ "name", "trigger_test", "DEP_TRIGGER" ] #SELECT v.name, f.name, 'DEP_FUNC' from functions as f, tables as v, dependencies as dep where v.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 AND v.type IN (1, 11) ORDER BY v.name, f.name; -% .v, .f, .L42 # table_name -% name, name, L42 # name +% .v, .f, .L15 # table_name +% name, name, L15 # name % varchar, varchar, char # type % 2, 2, 8 # length [ "v1", "f2", "DEP_FUNC" ] #SELECT v.name, i.name, 'DEP_INDEX' from tables as v, idxs as i where i.table_id = v.id and i.name not in (select name from keys) and v.type = 1 order by v.name, i.name; -% .v, .i, .L45 # table_name -% name, name, L45 # name +% .v, .i, .L16 # table_name +% name, name, L16 # name % varchar, varchar, char # type % 0, 0, 9 # length -#SELECT v.name, tri.name, 'DEP_TRIGGER' from tables as v, triggers as tri, dependencies as dep where dep.id = v.id AND dep.depend_id =tri.id AND dep.depend_type = 8 AND v.type = 1; -% .v, .tri, .L42 # table_name -% name, name, L42 # name +#SELECT v.name, tri.name, 'DEP_TRIGGER' from tables as v, triggers as tri, dependencies as dep where dep.id = v.id AND dep.depend_id =tri.id AND dep.depend_type = 8 AND v.type = 1 order by v.name, tri.name; +% .v, .tri, .L15 # table_name +% name, name, L15 # name % varchar, varchar, char # type % 0, 0, 11 # length #SELECT f1.name, f2.name, 'DEP_FUNC' from functions as f1, functions as f2, dependencies as dep where f1.id = dep.id AND f2.id = dep.depend_id AND dep.depend_type = 7 order by f2.name, f1.name; -% sys.f1, sys.f2, .L4 # table_name -% name, name, L4 # name +% sys.f1, sys.f2, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 17, 13, 8 # length [ "f1", "f2", "DEP_FUNC" ] @@ -228,13 +230,13 @@ Dependencies between database objects [ "internaltransform", "st_transform", "DEP_FUNC" ] [ "st_srid", "st_transform", "DEP_FUNC" ] #SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f, triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id =tri.id AND dep.depend_type = 8 order by f.name, tri.name; -% sys.f, sys.tri, .L4 # table_name -% name, name, L4 # name +% sys.f, sys.tri, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 0, 0, 11 # length -#SELECT k.name, fk.name, 'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id; -% sys.k, sys.fk, .L4 # table_name -% name, name, L4 # name +#SELECT k.name, fk.name, 'DEP_FKEY' from keys as k, keys as fk where fk.rkey = k.id order by k.name, fk.name; +% sys.k, sys.fk, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 18, 15, 8 # length [ "files_pkey_file_id", "pg_fkey_file_id", "DEP_FKEY" ] @@ -286,8 +288,8 @@ Dependencies between functions with same # END IF; #END; #SELECT f1.name, f2.name, 'DEP_FUNC' from functions as f1, functions as f2, dependencies as dep where f1.id = dep.id AND f2.id = dep.depend_id AND dep.depend_type = 7 order by f2.name, f1.name; -% sys.f1, sys.f2, .L4 # table_name -% name, name, L4 # name +% sys.f1, sys.f2, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 17, 13, 8 # length [ "f1", "f2", "DEP_FUNC" ] @@ -302,8 +304,8 @@ Dependencies between functions with same #DROP FUNCTION f3; #DROP ALL FUNCTION f1; #SELECT f1.name, f2.name, 'DEP_FUNC' from functions as f1, functions as f2, dependencies as dep where f1.id = dep.id AND f2.id = dep.depend_id AND dep.depend_type = 7 order by f2.name, f1.name; -% sys.f1, sys.f2, .L4 # table_name -% name, name, L4 # name +% sys.f1, sys.f2, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 17, 13, 8 # length [ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] @@ -325,15 +327,15 @@ Cleanup #ALTER USER "monet_test" SET SCHEMA "sys"; #DROP SCHEMA test; #DROP USER monet_test; -#SELECT s.name, u.name, 'DEP_USER' from schemas as s, users u where u.default_schema = s.id; -% sys.s, .u, .L11 # table_name -% name, name, L11 # name +#SELECT s.name, u.name, 'DEP_USER' from schemas as s, users u where u.default_schema = s.id order by s.name, u.name; +% sys.s, .u, .L5 # table_name +% name, name, L5 # name % varchar, varchar, char # type % 3, 7, 8 # length [ "sys", "monetdb", "DEP_USER" ] -#SELECT a.name, s.name, 'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id; -% sys.a, sys.s, .L4 # table_name -% name, name, L4 # name +#SELECT a.name, s.name, 'DEP_SCHEMA' from schemas as s, auths a where s.owner = a.id order by a.name, s.name; +% sys.a, sys.s, .L1 # table_name +% name, name, L1 # name % varchar, varchar, char # type % 7, 8, 10 # length [ "monetdb", "bam", "DEP_SCHEMA" ] @@ -341,9 +343,11 @@ Cleanup [ "monetdb", "profiler", "DEP_SCHEMA" ] [ "monetdb", "sys", "DEP_SCHEMA" ] [ "monetdb", "tmp", "DEP_SCHEMA" ] +[ "monetdb", "wlc", "DEP_SCHEMA" ] +[ "monetdb", "wlr", "DEP_SCHEMA" ] #SELECT t.name, v.name, 'DEP_VIEW' from tables as t, tables as v, dependencies as dep where t.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by t.name, v.name; -% .t, .v, .L100 # table_name -% name, name, L100 # name +% .t, .v, .L31 # table_name +% name, name, L31 # name % varchar, varchar, char # type % 17, 34, 8 # length [ "_columns", "ids", "DEP_VIEW" ] @@ -450,34 +454,34 @@ Cleanup [ "types", "ids", "DEP_VIEW" ] [ "users", "dependency_schemas_on_users", "DEP_VIEW" ] #SELECT t.name, i.name, 'DEP_INDEX' from tables as t, idxs as i where i.table_id = t.id and i.name not in (select name from keys) and t.type in (0, 10, 20, 30) order by t.name, i.name; -% .t, .i, .L45 # table_name -% name, name, L45 # name +% .t, .i, .L16 # table_name +% name, name, L16 # name % varchar, varchar, char # type % 0, 0, 9 # length #(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from tables as t, triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from triggers tri, tables t, dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8) order by name, trigname; -% .L115, .L115, .L115 # table_name -% name, trigname, L44 # name +% .L43, .L43, .L43 # table_name +% name, trigname, L17 # name % varchar, varchar, char # type % 7, 21, 11 # length [ "_tables", "system_update_tables", "DEP_TRIGGER" ] [ "schemas", "system_update_schemas", "DEP_TRIGGER" ] #SELECT t.name, fk.name, 'DEP_FKEY' from tables as t, keys as k, keys as fk where fk.rkey = k.id and k.table_id = t.id order by t.name, fk.name; -% .t, .fk, .L42 # table_name -% name, name, L42 # name +% .t, .fk, .L15 # table_name +% name, name, L15 # name % varchar, varchar, char # type % 5, 15, 8 # length [ "files", "pg_fkey_file_id", "DEP_FKEY" ] [ "files", "rg_fkey_file_id", "DEP_FKEY" ] [ "files", "sq_fkey_file_id", "DEP_FKEY" ] #SELECT t.name, f.name, 'DEP_FUNC' from functions as f, tables as t, dependencies as dep where t.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 AND t.type in (0, 10, 20, 30) ORDER BY t.name, f.name; -% .t, .f, .L42 # table_name -% name, name, L42 # name +% .t, .f, .L15 # table_name +% name, name, L15 # name _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
