Changeset: 200f32b5f7d2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=200f32b5f7d2 Modified Files: sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 Branch: Mar2018 Log Message:
Approve outputs diffs (truncated from 307 to 300 lines): diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 223 ] +[ 225 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 187 ] +[ 189 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 187 ] +[ 189 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type, width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name 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 @@ -178,6 +178,7 @@ Dependencies between database objects % name, name, L17 # name % varchar, varchar, char # type % 20, 44, 7 # length +[ "id", "comments_id_pkey", "DEP_KEY" ] [ "dependency_type_id", "dependency_types_dependency_type_id_pkey", "DEP_KEY" ] [ "dependency_type_name", "dependency_types_dependency_type_name_unique", "DEP_KEY" ] [ "srid", "spatial_ref_sys_srid_pkey", "DEP_KEY" ] @@ -201,7 +202,6 @@ Dependencies between database objects [ "file_id", "rg_pkey_id_file_id", "DEP_KEY" ] [ "id", "pg_pkey_id_file_id", "DEP_KEY" ] [ "file_id", "pg_pkey_id_file_id", "DEP_KEY" ] -[ "id", "comments_id_pkey", "DEP_KEY" ] [ "id", "t1_id_pkey", "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); % .c, .i, .L21 # table_name @@ -691,18 +691,6 @@ Cleanup [ "schemas", "geometry_columns", "DEP_VIEW" ] [ "types", "geometry_columns", "DEP_VIEW" ] [ "auths", "roles", "DEP_VIEW" ] -[ "_tables", "describe_all_objects", "DEP_VIEW" ] -[ "comments", "describe_all_objects", "DEP_VIEW" ] -[ "schemas", "describe_all_objects", "DEP_VIEW" ] -[ "table_types", "describe_all_objects", "DEP_VIEW" ] -[ "sequences", "describe_all_objects", "DEP_VIEW" ] -[ "functions", "describe_all_objects", "DEP_VIEW" ] -[ "systemfunctions", "describe_all_objects", "DEP_VIEW" ] -[ "functions", "commented_function_signatures", "DEP_VIEW" ] -[ "comments", "commented_function_signatures", "DEP_VIEW" ] -[ "schemas", "commented_function_signatures", "DEP_VIEW" ] -[ "systemfunctions", "commented_function_signatures", "DEP_VIEW" ] -[ "args", "commented_function_signatures", "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); % .t, .i, .L44 # table_name % name, name, L44 # name @@ -976,46 +964,12 @@ Cleanup [ "id", "roles", "DEP_VIEW" ] [ "name", "roles", "DEP_VIEW" ] [ "grantor", "roles", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "type", "describe_all_objects", "DEP_VIEW" ] -[ "system", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "remark", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "table_type_id", "describe_all_objects", "DEP_VIEW" ] -[ "table_type_name", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "type", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "function_id", "describe_all_objects", "DEP_VIEW" ] -[ "system", "describe_all_objects", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "name", "commented_function_signatures", "DEP_VIEW" ] -[ "type", "commented_function_signatures", "DEP_VIEW" ] -[ "schema_id", "commented_function_signatures", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "remark", "commented_function_signatures", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "name", "commented_function_signatures", "DEP_VIEW" ] -[ "function_id", "commented_function_signatures", "DEP_VIEW" ] -[ "func_id", "commented_function_signatures", "DEP_VIEW" ] -[ "type", "commented_function_signatures", "DEP_VIEW" ] -[ "type_digits", "commented_function_signatures", "DEP_VIEW" ] -[ "type_scale", "commented_function_signatures", "DEP_VIEW" ] -[ "inout", "commented_function_signatures", "DEP_VIEW" ] -[ "number", "commented_function_signatures", "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; % .c, .k, .L17 # table_name % name, name, L17 # name % varchar, varchar, char # type % 20, 44, 7 # length +[ "id", "comments_id_pkey", "DEP_KEY" ] [ "dependency_type_id", "dependency_types_dependency_type_id_pkey", "DEP_KEY" ] [ "dependency_type_name", "dependency_types_dependency_type_name_unique", "DEP_KEY" ] [ "srid", "spatial_ref_sys_srid_pkey", "DEP_KEY" ] @@ -1039,7 +993,6 @@ Cleanup [ "file_id", "rg_pkey_id_file_id", "DEP_KEY" ] [ "id", "pg_pkey_id_file_id", "DEP_KEY" ] [ "file_id", "pg_pkey_id_file_id", "DEP_KEY" ] -[ "id", "comments_id_pkey", "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); % .c, .i, .L21 # table_name % name, name, L21 # 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 @@ -178,6 +178,7 @@ Dependencies between database objects % name, name, L17 # name % varchar, varchar, char # type % 20, 44, 7 # length +[ "id", "comments_id_pkey", "DEP_KEY" ] [ "dependency_type_id", "dependency_types_dependency_type_id_pkey", "DEP_KEY" ] [ "dependency_type_name", "dependency_types_dependency_type_name_unique", "DEP_KEY" ] [ "srid", "spatial_ref_sys_srid_pkey", "DEP_KEY" ] @@ -201,7 +202,6 @@ Dependencies between database objects [ "file_id", "rg_pkey_id_file_id", "DEP_KEY" ] [ "id", "pg_pkey_id_file_id", "DEP_KEY" ] [ "file_id", "pg_pkey_id_file_id", "DEP_KEY" ] -[ "id", "comments_id_pkey", "DEP_KEY" ] [ "id", "t1_id_pkey", "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); % .c, .i, .L21 # table_name @@ -691,18 +691,6 @@ Cleanup [ "schemas", "geometry_columns", "DEP_VIEW" ] [ "types", "geometry_columns", "DEP_VIEW" ] [ "auths", "roles", "DEP_VIEW" ] -[ "_tables", "describe_all_objects", "DEP_VIEW" ] -[ "comments", "describe_all_objects", "DEP_VIEW" ] -[ "schemas", "describe_all_objects", "DEP_VIEW" ] -[ "table_types", "describe_all_objects", "DEP_VIEW" ] -[ "sequences", "describe_all_objects", "DEP_VIEW" ] -[ "functions", "describe_all_objects", "DEP_VIEW" ] -[ "systemfunctions", "describe_all_objects", "DEP_VIEW" ] -[ "functions", "commented_function_signatures", "DEP_VIEW" ] -[ "comments", "commented_function_signatures", "DEP_VIEW" ] -[ "schemas", "commented_function_signatures", "DEP_VIEW" ] -[ "systemfunctions", "commented_function_signatures", "DEP_VIEW" ] -[ "args", "commented_function_signatures", "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); % .t, .i, .L44 # table_name % name, name, L44 # name @@ -976,46 +964,12 @@ Cleanup [ "id", "roles", "DEP_VIEW" ] [ "name", "roles", "DEP_VIEW" ] [ "grantor", "roles", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "type", "describe_all_objects", "DEP_VIEW" ] -[ "system", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "remark", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "table_type_id", "describe_all_objects", "DEP_VIEW" ] -[ "table_type_name", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "id", "describe_all_objects", "DEP_VIEW" ] -[ "name", "describe_all_objects", "DEP_VIEW" ] -[ "type", "describe_all_objects", "DEP_VIEW" ] -[ "schema_id", "describe_all_objects", "DEP_VIEW" ] -[ "function_id", "describe_all_objects", "DEP_VIEW" ] -[ "system", "describe_all_objects", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "name", "commented_function_signatures", "DEP_VIEW" ] -[ "type", "commented_function_signatures", "DEP_VIEW" ] -[ "schema_id", "commented_function_signatures", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "remark", "commented_function_signatures", "DEP_VIEW" ] -[ "id", "commented_function_signatures", "DEP_VIEW" ] -[ "name", "commented_function_signatures", "DEP_VIEW" ] -[ "function_id", "commented_function_signatures", "DEP_VIEW" ] -[ "func_id", "commented_function_signatures", "DEP_VIEW" ] -[ "type", "commented_function_signatures", "DEP_VIEW" ] -[ "type_digits", "commented_function_signatures", "DEP_VIEW" ] -[ "type_scale", "commented_function_signatures", "DEP_VIEW" ] -[ "inout", "commented_function_signatures", "DEP_VIEW" ] -[ "number", "commented_function_signatures", "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; % .c, .k, .L17 # table_name % name, name, L17 # name % varchar, varchar, char # type % 20, 44, 7 # length +[ "id", "comments_id_pkey", "DEP_KEY" ] [ "dependency_type_id", "dependency_types_dependency_type_id_pkey", "DEP_KEY" ] [ "dependency_type_name", "dependency_types_dependency_type_name_unique", "DEP_KEY" ] [ "srid", "spatial_ref_sys_srid_pkey", "DEP_KEY" ] @@ -1039,7 +993,6 @@ Cleanup [ "file_id", "rg_pkey_id_file_id", "DEP_KEY" ] [ "id", "pg_pkey_id_file_id", "DEP_KEY" ] [ "file_id", "pg_pkey_id_file_id", "DEP_KEY" ] -[ "id", "comments_id_pkey", "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); % .c, .i, .L21 # table_name % name, name, L21 # name diff --git a/sql/test/Dependencies/Tests/dependency_loop.stable.out b/sql/test/Dependencies/Tests/dependency_loop.stable.out --- a/sql/test/Dependencies/Tests/dependency_loop.stable.out +++ b/sql/test/Dependencies/Tests/dependency_loop.stable.out @@ -119,7 +119,7 @@ Ready. % L3 # name % bigint # type % 3 # length -[ 430 ] +[ 381 ] # 10:37:19 > # 10:37:19 > Done. diff --git a/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 b/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 --- a/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 +++ b/sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 @@ -119,7 +119,7 @@ Ready. % L3 # name % bigint # type % 3 # length -[ 430 ] +[ 381 ] # 10:37:19 > # 10:37:19 > Done. diff --git a/sql/test/Tests/keys.stable.out b/sql/test/Tests/keys.stable.out --- a/sql/test/Tests/keys.stable.out +++ b/sql/test/Tests/keys.stable.out @@ -61,6 +61,7 @@ Ready. % name, type, name, type # name % varchar, int, varchar, int # type % 44, 1, 44, 1 # length +[ "comments_id_pkey", 0, "comments_id_pkey", 0 ] [ "dependency_types_dependency_type_id_pkey", 0, "dependency_types_dependency_type_id_pkey", 0 ] [ "dependency_types_dependency_type_name_unique", 0, "dependency_types_dependency_type_name_unique", 1 ] [ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0 ] @@ -84,7 +85,6 @@ Ready. [ "rg_fkey_file_id", 1, "rg_fkey_file_id", 2 ] [ "pg_pkey_id_file_id", 0, "pg_pkey_id_file_id", 0 ] [ "pg_fkey_file_id", 1, "pg_fkey_file_id", 2 ] -[ "comments_id_pkey", 0, "comments_id_pkey", 0 ] [ "unique_key", 0, "unique_key", 1 ] [ "allnewtriples_subject_idx", 0, NULL, NULL ] [ "allnewtriples_predicate_idx", 0, NULL, NULL ] @@ -95,6 +95,7 @@ Ready. % name, type, name, type # name % varchar, int, varchar, int # type % 44, 1, 44, 1 # length +[ "comments_id_pkey", 0, "comments_id_pkey", 0 ] [ "dependency_types_dependency_type_id_pkey", 0, "dependency_types_dependency_type_id_pkey", 0 ] [ "dependency_types_dependency_type_name_unique", 0, "dependency_types_dependency_type_name_unique", 1 ] [ "spatial_ref_sys_srid_pkey", 0, "spatial_ref_sys_srid_pkey", 0 ] @@ -118,7 +119,6 @@ Ready. [ "rg_fkey_file_id", 1, "rg_fkey_file_id", 2 ] [ "pg_pkey_id_file_id", 0, "pg_pkey_id_file_id", 0 ] [ "pg_fkey_file_id", 1, "pg_fkey_file_id", 2 ] -[ "comments_id_pkey", 0, "comments_id_pkey", 0 ] [ "unique_key", 0, "unique_key", 1 ] # 16:23:54 > diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -606,8 +606,6 @@ Ready. [ "sys", "floor", 1, "real", "" ] [ "sys", "floor", 0, "double", "floor" ] [ "sys", "floor", 1, "double", "" ] -[ "sys", "function_type_keyword", 0, "varchar", "create function sys.function_type_keyword(ftype int)\nreturns varchar(20)\nbegin\n return case ftype\n when 1 then 'FUNCTION'\n when 2 then 'PROCEDURE'\n when 3 then 'AGGREGATE'\n when 4 then 'FILTER FUNCTION'\n when 5 then 'FUNCTION' \n when 6 then 'FUNCTION' \n when 7 then 'LOADER'\n else 'ROUTINE'\n end;\nend;" ] -[ "sys", "function_type_keyword", 1, "int", "" ] [ "sys", "fuse", 0, "smallint", "create function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] [ "sys", "fuse", 2, "tinyint", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -640,8 +640,6 @@ Ready. [ "sys", "floor", 1, "real", "" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
