Changeset: 625f428c2ceb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=625f428c2ceb Modified Files: monetdb5/mal/Tests/tst830.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out Branch: default Log Message:
.snapshot user approves diffs (truncated from 477 to 300 lines): diff --git a/monetdb5/mal/Tests/tst830.stable.out b/monetdb5/mal/Tests/tst830.stable.out --- a/monetdb5/mal/Tests/tst830.stable.out +++ b/monetdb5/mal/Tests/tst830.stable.out @@ -80,21 +80,23 @@ catch InvalidCredentialsException:str; exit InvalidCredentialsException:str; #[51] (0) 26 end user.foo; #[52] (0) 0: MALException:addUser:user 'monetdb' already exists -[ 1@0 ] [ 2@0 ] +[ 3@0 ] #--------------------------# # h t t # name # void void str # type #--------------------------# [ 0@0, 0@0, "monetdb" ] -[ 1@0, 1@0, "test" ] -[ 2@0, 2@0, "checkpoint" ] +[ 1@0, 1@0, ".snapshot" ] +[ 2@0, 2@0, "test" ] +[ 3@0, 3@0, "checkpoint" ] #--------------------------# # h t t # name # void void str # type #--------------------------# [ 0@0, 0@0, "monetdb" ] -[ 1@0, 1@0, "test" ] +[ 1@0, 1@0, ".snapshot" ] +[ 2@0, 2@0, "test" ] 1: InvalidCredentialsException:setPassword:The administrator cannot set its own password, use changePassword instead 3: InvalidCredentialsException:checkCredentials:invalid credentials for user 'monetdb' 4: InvalidCredentialsException:checkCredentials:invalid credentials for user 'monetdb' 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 @@ -79,6 +79,7 @@ Dependencies between database objects % name, name, %4 # name % varchar, varchar, char # type % 4, 10, 8 # length +[ "sys", ".snapshot", "DEP_USER" ] [ "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 order by a.name, s.name; @@ -94,22 +95,22 @@ Dependencies between database objects [ "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, .%14 # table_name -% name, name, %14 # name +#SELECT t.name, v.name, 'DEP_VIEW' from sys.tables as t, sys.tables as v, sys.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, .%20 # table_name +% name, name, %20 # 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, .%12 # table_name -% name, name, %12 # name +#SELECT t.name, i.name, 'DEP_INDEX' from sys.tables as t, sys.idxs as i where i.table_id = t.id and i.name not in (select name from sys.keys) and t.type = 0 order by t.name, i.name; +% .t, .i, .%14 # table_name +% name, name, %14 # 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) order by name, trigname; -% .%21, .%21, .%21 # table_name -% name, trigname, %14 # name +#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.tables as t, sys.triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.triggers tri, sys.tables t, sys.dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8) order by name, trigname; +% .%25, .%25, .%25 # table_name +% name, trigname, %20 # name % varchar, varchar, char # type % 7, 21, 11 # length [ "_tables", "system_update_tables", "DEP_TRIGGER" ] @@ -118,22 +119,22 @@ 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 order by t.name, fk.name; -% .t, .fk, .%7 # table_name -% name, name, %7 # name +#SELECT t.name, fk.name, 'DEP_FKEY' from sys.tables as t, sys.keys as k, sys.keys as fk where fk.rkey = k.id and k.table_id = t.id order by t.name, fk.name; +% .t, .fk, .%11 # table_name +% name, name, %11 # name % varchar, varchar, char # type % 2, 13, 8 # length [ "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, .%12 # table_name -% name, name, %12 # name +#SELECT t.name, f.name, 'DEP_FUNC' from sys.functions as f, sys.tables as t, sys.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, .%14 # table_name +% name, name, %14 # 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, .%15 # table_name -% name, name, %15 # name +#SELECT c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v, sys.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, .%17 # table_name +% name, name, %17 # name % varchar, varchar, char # type % 4, 2, 8 # length [ "age", "v1", "DEP_VIEW" ] @@ -196,20 +197,20 @@ Dependencies between database objects [ "id", "trigger_test_4", "DEP_TRIGGER" ] [ "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, .%12 # table_name -% name, name, %12 # name +#SELECT v.name, f.name, 'DEP_FUNC' from sys.functions as f, sys.tables as v, sys.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, .%14 # table_name +% name, name, %14 # 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, .%12 # table_name -% name, name, %12 # name +#SELECT v.name, i.name, 'DEP_INDEX' from sys.tables as v, sys.idxs as i where i.table_id = v.id and i.name not in (select name from sys.keys) and v.type = 1 order by v.name, i.name; +% .v, .i, .%14 # table_name +% name, name, %14 # 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 order by v.name, tri.name; -% .v, .tri, .%7 # table_name -% name, name, %7 # name +#SELECT v.name, tri.name, 'DEP_TRIGGER' from sys.tables as v, sys.triggers as tri, sys.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, .%11 # table_name +% name, name, %11 # 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; @@ -325,7 +326,8 @@ Cleanup % sys.s, .u, .%4 # table_name % name, name, %4 # name % varchar, varchar, char # type -% 3, 7, 8 # length +% 3, 9, 8 # length +[ "sys", ".snapshot", "DEP_USER" ] [ "sys", "monetdb", "DEP_USER" ] #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, .%2 # table_name @@ -339,9 +341,9 @@ Cleanup [ "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, .%21 # table_name -% name, name, %21 # name +#SELECT t.name, v.name, 'DEP_VIEW' from sys.tables as t, sys.tables as v, sys.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, .%25 # table_name +% name, name, %25 # name % varchar, varchar, char # type % 17, 34, 8 # length [ "_columns", "columns", "DEP_VIEW" ] @@ -452,32 +454,32 @@ Cleanup [ "types", "geometry_columns", "DEP_VIEW" ] [ "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, .%17 # table_name -% name, name, %17 # name +#SELECT t.name, i.name, 'DEP_INDEX' from sys.tables as t, sys.idxs as i where i.table_id = t.id and i.name not in (select name from sys.keys) and t.type in (0, 10, 20, 30) order by t.name, i.name; +% .t, .i, .%21 # table_name +% name, name, %21 # 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; -% .%21, .%21, .%21 # table_name -% name, trigname, %14 # name +#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.tables as t, sys.triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.triggers tri, sys.tables t, sys.dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8) order by name, trigname; +% .%25, .%25, .%25 # table_name +% name, trigname, %20 # 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, .%7 # table_name -% name, name, %7 # name +#SELECT t.name, fk.name, 'DEP_FKEY' from sys.tables as t, sys.keys as k, sys.keys as fk where fk.rkey = k.id and k.table_id = t.id order by t.name, fk.name; +% .t, .fk, .%11 # table_name +% name, name, %11 # name % varchar, varchar, char # type % 0, 0, 8 # length -#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, .%14 # table_name -% name, name, %14 # name +#SELECT t.name, f.name, 'DEP_FUNC' from sys.functions as f, sys.tables as t, sys.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, .%16 # table_name +% name, name, %16 # name % varchar, varchar, char # type % 15, 8, 8 # length [ "spatial_ref_sys", "getproj4", "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 in (1, 11, 21, 31) order by c.name, v.name; -% .c, .v, .%22 # table_name -% name, name, %22 # name +#SELECT c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v, sys.dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by c.name, v.name; +% .c, .v, .%24 # table_name +% name, name, %24 # name % varchar, varchar, char # type % 20, 34, 8 # length [ "access", "tables", "DEP_VIEW" ] @@ -899,19 +901,19 @@ Cleanup % name, name, %10 # name % varchar, varchar, char # type % 0, 0, 11 # length -#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, 21, 31) ORDER BY v.name, f.name; -% .v, .f, .%14 # table_name -% name, name, %14 # name +#SELECT v.name, f.name, 'DEP_FUNC' from sys.functions as f, sys.tables as v, sys.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, 21, 31) ORDER BY v.name, f.name; +% .v, .f, .%16 # table_name +% name, name, %16 # name % varchar, varchar, char # type % 0, 0, 8 # length -#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 in (1, 11, 21, 31) order by v.name, i.name; -% .v, .i, .%17 # table_name -% name, name, %17 # name +#SELECT v.name, i.name, 'DEP_INDEX' from sys.tables as v, sys.idxs as i where i.table_id = v.id and i.name not in (select name from sys.keys) and v.type in (1, 11, 21, 31) order by v.name, i.name; +% .v, .i, .%21 # table_name +% name, name, %21 # 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 in (1, 11, 21, 31) order by v.name, tri.name; -% .v, .tri, .%14 # table_name -% name, name, %14 # name +#SELECT v.name, tri.name, 'DEP_TRIGGER' from sys.tables as v, sys.objects as tri, sys.dependencies as dep where dep.id = v.id AND dep.depend_id =tri.id AND dep.depend_type = 8 AND v.type in (1, 11, 21, 31) order by v.name, tri.name; +% .v, .tri, .%16 # table_name +% name, name, %16 # 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 f1.name, f2.name; diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 --- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 +++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128 @@ -79,6 +79,7 @@ Dependencies between database objects % name, name, %4 # name % varchar, varchar, char # type % 4, 10, 8 # length +[ "sys", ".snapshot", "DEP_USER" ] [ "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 order by a.name, s.name; @@ -94,22 +95,22 @@ Dependencies between database objects [ "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, .%14 # table_name -% name, name, %14 # name +#SELECT t.name, v.name, 'DEP_VIEW' from sys.tables as t, sys.tables as v, sys.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, .%20 # table_name +% name, name, %20 # 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, .%12 # table_name -% name, name, %12 # name +#SELECT t.name, i.name, 'DEP_INDEX' from sys.tables as t, sys.idxs as i where i.table_id = t.id and i.name not in (select name from sys.keys) and t.type = 0 order by t.name, i.name; +% .t, .i, .%14 # table_name +% name, name, %14 # 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) order by name, trigname; -% .%21, .%21, .%21 # table_name -% name, trigname, %14 # name +#(SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.tables as t, sys.triggers as tri where tri.table_id = t.id) UNION (SELECT t.name as name, tri.name as trigname, 'DEP_TRIGGER' from sys.triggers tri, sys.tables t, sys.dependencies dep where dep.id = t.id AND dep.depend_id =tri.id AND dep.depend_type = 8) order by name, trigname; +% .%25, .%25, .%25 # table_name +% name, trigname, %20 # name % varchar, varchar, char # type % 7, 21, 11 # length [ "_tables", "system_update_tables", "DEP_TRIGGER" ] @@ -118,22 +119,22 @@ 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 order by t.name, fk.name; -% .t, .fk, .%7 # table_name -% name, name, %7 # name +#SELECT t.name, fk.name, 'DEP_FKEY' from sys.tables as t, sys.keys as k, sys.keys as fk where fk.rkey = k.id and k.table_id = t.id order by t.name, fk.name; +% .t, .fk, .%11 # table_name +% name, name, %11 # name % varchar, varchar, char # type % 2, 13, 8 # length [ "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, .%12 # table_name -% name, name, %12 # name +#SELECT t.name, f.name, 'DEP_FUNC' from sys.functions as f, sys.tables as t, sys.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, .%14 # table_name +% name, name, %14 # name % varchar, varchar, char # type % 15, 8, 8 # length _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
