Changeset: 4610aee7e6ab for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4610aee7e6ab Modified Files: 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/Dependencies/dependency_DBobjects.sql sql/test/Dependencies/dependency_owner_schema_3.sql Branch: Mar2018 Log Message:
Add ordering to tests. diffs (truncated from 1835 to 300 lines): 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 @@ -87,13 +87,13 @@ Dependencies between database objects % name, name, L4 # name % varchar, varchar, char # type % 7, 8, 10 # length -[ "monetdb", "sys", "DEP_SCHEMA" ] -[ "monetdb", "tmp", "DEP_SCHEMA" ] +[ "monetdb", "bam", "DEP_SCHEMA" ] [ "monetdb", "json", "DEP_SCHEMA" ] [ "monetdb", "profiler", "DEP_SCHEMA" ] -[ "monetdb", "bam", "DEP_SCHEMA" ] +[ "monetdb", "sys", "DEP_SCHEMA" ] [ "monetdb", "test", "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; +[ "monetdb", "tmp", "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 % varchar, varchar, char # type @@ -111,8 +111,8 @@ Dependencies between database objects % name, trigname, L44 # name % varchar, varchar, char # type % 7, 21, 11 # length +[ "_tables", "system_update_tables", "DEP_TRIGGER" ] [ "schemas", "system_update_schemas", "DEP_TRIGGER" ] -[ "_tables", "system_update_tables", "DEP_TRIGGER" ] [ "t1", "trigger_test", "DEP_TRIGGER" ] [ "t1", "trigger_test_4", "DEP_TRIGGER" ] [ "t2", "trigger_test", "DEP_TRIGGER" ] @@ -122,9 +122,9 @@ Dependencies between database objects % name, name, L42 # name % varchar, varchar, char # type % 5, 15, 8 # length -[ "files", "sq_fkey_file_id", "DEP_FKEY" ] +[ "files", "pg_fkey_file_id", "DEP_FKEY" ] [ "files", "rg_fkey_file_id", "DEP_FKEY" ] -[ "files", "pg_fkey_file_id", "DEP_FKEY" ] +[ "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 @@ -170,40 +170,40 @@ Dependencies between database objects % name, name, L55 # name % varchar, varchar, char # type % 4, 2, 8 # length +[ "age", "v1", "DEP_VIEW" ] [ "id", "v1", "DEP_VIEW" ] [ "name", "v1", "DEP_VIEW" ] -[ "age", "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; +#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 % 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" ] -[ "keyword", "keywords_keyword_pkey", "DEP_KEY" ] -[ "table_type_id", "table_types_table_type_id_pkey", "DEP_KEY" ] -[ "table_type_name", "table_types_table_type_name_unique", "DEP_KEY" ] +[ "file_id", "files_pkey_file_id", "DEP_KEY" ] +[ "file_id", "pg_pkey_id_file_id", "DEP_KEY" ] +[ "file_id", "rg_pkey_id_file_id", "DEP_KEY" ] +[ "file_id", "sq_pkey_sn_file_id", "DEP_KEY" ] [ "function_type_id", "function_types_function_type_id_pkey", "DEP_KEY" ] [ "function_type_name", "function_types_function_type_name_unique", "DEP_KEY" ] -[ "language_id", "function_languages_language_id_pkey", "DEP_KEY" ] -[ "language_name", "function_languages_language_name_unique", "DEP_KEY" ] +[ "id", "comments_id_pkey", "DEP_KEY" ] +[ "id", "pg_pkey_id_file_id", "DEP_KEY" ] +[ "id", "rg_pkey_id_file_id", "DEP_KEY" ] +[ "id", "t1_id_pkey", "DEP_KEY" ] +[ "index_type_id", "index_types_index_type_id_pkey", "DEP_KEY" ] +[ "index_type_name", "index_types_index_type_name_unique", "DEP_KEY" ] [ "key_type_id", "key_types_key_type_id_pkey", "DEP_KEY" ] [ "key_type_name", "key_types_key_type_name_unique", "DEP_KEY" ] -[ "index_type_id", "index_types_index_type_id_pkey", "DEP_KEY" ] -[ "index_type_name", "index_types_index_type_name_unique", "DEP_KEY" ] +[ "keyword", "keywords_keyword_pkey", "DEP_KEY" ] +[ "language_id", "function_languages_language_id_pkey", "DEP_KEY" ] +[ "language_name", "function_languages_language_name_unique", "DEP_KEY" ] [ "privilege_code_id", "privilege_codes_privilege_code_id_pkey", "DEP_KEY" ] [ "privilege_code_name", "privilege_codes_privilege_code_name_unique", "DEP_KEY" ] -[ "file_id", "files_pkey_file_id", "DEP_KEY" ] [ "sn", "sq_pkey_sn_file_id", "DEP_KEY" ] -[ "file_id", "sq_pkey_sn_file_id", "DEP_KEY" ] -[ "id", "rg_pkey_id_file_id", "DEP_KEY" ] -[ "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", "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); +[ "srid", "spatial_ref_sys_srid_pkey", "DEP_KEY" ] +[ "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, .L21 # table_name % name, name, L21 # name % varchar, varchar, char # type @@ -417,12 +417,12 @@ Dependencies between database objects % name, name, L17 # name % varchar, varchar, char # type % 6, 14, 11 # length -[ "id_t1", "trigger_test", "DEP_TRIGGER" ] +[ "age", "trigger_test", "DEP_TRIGGER" ] [ "age_v1", "trigger_test", "DEP_TRIGGER" ] [ "id", "trigger_test", "DEP_TRIGGER" ] +[ "id", "trigger_test_4", "DEP_TRIGGER" ] +[ "id_t1", "trigger_test", "DEP_TRIGGER" ] [ "name", "trigger_test", "DEP_TRIGGER" ] -[ "age", "trigger_test", "DEP_TRIGGER" ] -[ "id", "trigger_test_4", "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 @@ -478,9 +478,9 @@ Dependencies between database objects % name, name, L4 # name % varchar, varchar, char # type % 18, 15, 8 # length -[ "files_pkey_file_id", "sq_fkey_file_id", "DEP_FKEY" ] +[ "files_pkey_file_id", "pg_fkey_file_id", "DEP_FKEY" ] [ "files_pkey_file_id", "rg_fkey_file_id", "DEP_FKEY" ] -[ "files_pkey_file_id", "pg_fkey_file_id", "DEP_FKEY" ] +[ "files_pkey_file_id", "sq_fkey_file_id", "DEP_FKEY" ] [ "t1_id_pkey", "t2_id_t1_fkey", "DEP_FKEY" ] #DROP FUNCTION f2; #DROP TRIGGER trigger_test; @@ -585,132 +585,132 @@ Cleanup % name, name, L4 # name % varchar, varchar, char # type % 7, 8, 10 # length +[ "monetdb", "bam", "DEP_SCHEMA" ] +[ "monetdb", "json", "DEP_SCHEMA" ] +[ "monetdb", "profiler", "DEP_SCHEMA" ] [ "monetdb", "sys", "DEP_SCHEMA" ] [ "monetdb", "tmp", "DEP_SCHEMA" ] -[ "monetdb", "json", "DEP_SCHEMA" ] -[ "monetdb", "profiler", "DEP_SCHEMA" ] -[ "monetdb", "bam", "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); +#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 % varchar, varchar, char # type % 16, 34, 8 # length -[ "auths", "ids", "DEP_VIEW" ] -[ "schemas", "ids", "DEP_VIEW" ] +[ "_columns", "ids", "DEP_VIEW" ] +[ "_columns", "ids", "DEP_VIEW" ] [ "_tables", "ids", "DEP_VIEW" ] [ "_tables", "ids", "DEP_VIEW" ] -[ "_columns", "ids", "DEP_VIEW" ] -[ "_columns", "ids", "DEP_VIEW" ] +[ "args", "dependency_args_on_types", "DEP_VIEW" ] +[ "args", "ids", "DEP_VIEW" ] +[ "auths", "dependency_owners_on_schemas", "DEP_VIEW" ] +[ "auths", "ids", "DEP_VIEW" ] +[ "auths", "roles", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_functions", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_indexes", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_keys", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_procedures", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_triggers", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_types", "DEP_VIEW" ] +[ "columns", "dependency_columns_on_views", "DEP_VIEW" ] +[ "columns", "geometry_columns", "DEP_VIEW" ] +[ "dependencies", "dependencies_vw", "DEP_VIEW" ] +[ "dependencies", "dependency_args_on_types", "DEP_VIEW" ] +[ "dependencies", "dependency_columns_on_functions", "DEP_VIEW" ] +[ "dependencies", "dependency_columns_on_procedures", "DEP_VIEW" ] +[ "dependencies", "dependency_columns_on_triggers", "DEP_VIEW" ] +[ "dependencies", "dependency_columns_on_types", "DEP_VIEW" ] +[ "dependencies", "dependency_columns_on_views", "DEP_VIEW" ] +[ "dependencies", "dependency_functions_on_functions", "DEP_VIEW" ] +[ "dependencies", "dependency_functions_on_procedures", "DEP_VIEW" ] +[ "dependencies", "dependency_functions_on_triggers", "DEP_VIEW" ] +[ "dependencies", "dependency_functions_on_types", "DEP_VIEW" ] +[ "dependencies", "dependency_functions_on_views", "DEP_VIEW" ] +[ "dependencies", "dependency_tables_on_functions", "DEP_VIEW" ] +[ "dependencies", "dependency_tables_on_procedures", "DEP_VIEW" ] +[ "dependencies", "dependency_tables_on_triggers", "DEP_VIEW" ] +[ "dependencies", "dependency_tables_on_views", "DEP_VIEW" ] +[ "dependencies", "dependency_views_on_functions", "DEP_VIEW" ] +[ "dependencies", "dependency_views_on_procedures", "DEP_VIEW" ] +[ "dependencies", "dependency_views_on_views", "DEP_VIEW" ] +[ "dependency_types", "dependencies_vw", "DEP_VIEW" ] +[ "functions", "dependency_args_on_types", "DEP_VIEW" ] +[ "functions", "dependency_columns_on_functions", "DEP_VIEW" ] +[ "functions", "dependency_columns_on_procedures", "DEP_VIEW" ] +[ "functions", "dependency_functions_on_functions", "DEP_VIEW" ] +[ "functions", "dependency_functions_on_procedures", "DEP_VIEW" ] +[ "functions", "dependency_functions_on_triggers", "DEP_VIEW" ] +[ "functions", "dependency_functions_on_types", "DEP_VIEW" ] +[ "functions", "dependency_functions_on_views", "DEP_VIEW" ] +[ "functions", "dependency_tables_on_functions", "DEP_VIEW" ] +[ "functions", "dependency_tables_on_procedures", "DEP_VIEW" ] +[ "functions", "dependency_views_on_functions", "DEP_VIEW" ] +[ "functions", "dependency_views_on_procedures", "DEP_VIEW" ] +[ "functions", "ids", "DEP_VIEW" ] +[ "ids", "dependencies_vw", "DEP_VIEW" ] +[ "idxs", "dependency_columns_on_indexes", "DEP_VIEW" ] +[ "idxs", "dependency_tables_on_indexes", "DEP_VIEW" ] +[ "idxs", "ids", "DEP_VIEW" ] +[ "idxs", "ids", "DEP_VIEW" ] +[ "keys", "dependency_columns_on_indexes", "DEP_VIEW" ] +[ "keys", "dependency_columns_on_keys", "DEP_VIEW" ] +[ "keys", "dependency_keys_on_foreignkeys", "DEP_VIEW" ] +[ "keys", "dependency_tables_on_foreignkeys", "DEP_VIEW" ] +[ "keys", "dependency_tables_on_indexes", "DEP_VIEW" ] [ "keys", "ids", "DEP_VIEW" ] [ "keys", "ids", "DEP_VIEW" ] -[ "idxs", "ids", "DEP_VIEW" ] -[ "idxs", "ids", "DEP_VIEW" ] +[ "objects", "dependency_columns_on_indexes", "DEP_VIEW" ] +[ "objects", "dependency_columns_on_keys", "DEP_VIEW" ] +[ "schemas", "dependency_owners_on_schemas", "DEP_VIEW" ] +[ "schemas", "dependency_schemas_on_users", "DEP_VIEW" ] +[ "schemas", "geometry_columns", "DEP_VIEW" ] +[ "schemas", "ids", "DEP_VIEW" ] +[ "sequences", "ids", "DEP_VIEW" ] +[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ] +[ "tables", "dependency_columns_on_keys", "DEP_VIEW" ] +[ "tables", "dependency_columns_on_triggers", "DEP_VIEW" ] +[ "tables", "dependency_columns_on_types", "DEP_VIEW" ] +[ "tables", "dependency_columns_on_views", "DEP_VIEW" ] +[ "tables", "dependency_functions_on_views", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_foreignkeys", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_functions", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_procedures", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_triggers", "DEP_VIEW" ] +[ "tables", "dependency_tables_on_views", "DEP_VIEW" ] +[ "tables", "dependency_views_on_functions", "DEP_VIEW" ] +[ "tables", "dependency_views_on_procedures", "DEP_VIEW" ] +[ "tables", "dependency_views_on_views", "DEP_VIEW" ] +[ "tables", "geometry_columns", "DEP_VIEW" ] +[ "triggers", "dependency_columns_on_triggers", "DEP_VIEW" ] +[ "triggers", "dependency_functions_on_triggers", "DEP_VIEW" ] +[ "triggers", "dependency_tables_on_triggers", "DEP_VIEW" ] [ "triggers", "ids", "DEP_VIEW" ] [ "triggers", "ids", "DEP_VIEW" ] -[ "functions", "ids", "DEP_VIEW" ] -[ "args", "ids", "DEP_VIEW" ] -[ "sequences", "ids", "DEP_VIEW" ] +[ "types", "dependency_args_on_types", "DEP_VIEW" ] +[ "types", "dependency_columns_on_types", "DEP_VIEW" ] +[ "types", "dependency_functions_on_types", "DEP_VIEW" ] +[ "types", "geometry_columns", "DEP_VIEW" ] [ "types", "ids", "DEP_VIEW" ] -[ "dependencies", "dependencies_vw", "DEP_VIEW" ] -[ "dependency_types", "dependencies_vw", "DEP_VIEW" ] -[ "ids", "dependencies_vw", "DEP_VIEW" ] -[ "schemas", "dependency_owners_on_schemas", "DEP_VIEW" ] -[ "auths", "dependency_owners_on_schemas", "DEP_VIEW" ] -[ "objects", "dependency_columns_on_keys", "DEP_VIEW" ] -[ "keys", "dependency_columns_on_keys", "DEP_VIEW" ] -[ "columns", "dependency_columns_on_keys", "DEP_VIEW" ] -[ "tables", "dependency_columns_on_keys", "DEP_VIEW" ] -[ "tables", "dependency_tables_on_views", "DEP_VIEW" ] -[ "dependencies", "dependency_tables_on_views", "DEP_VIEW" ] -[ "tables", "dependency_views_on_views", "DEP_VIEW" ] -[ "dependencies", "dependency_views_on_views", "DEP_VIEW" ] -[ "tables", "dependency_columns_on_views", "DEP_VIEW" ] -[ "dependencies", "dependency_columns_on_views", "DEP_VIEW" ] -[ "columns", "dependency_columns_on_views", "DEP_VIEW" ] -[ "tables", "dependency_functions_on_views", "DEP_VIEW" ] -[ "dependencies", "dependency_functions_on_views", "DEP_VIEW" ] -[ "functions", "dependency_functions_on_views", "DEP_VIEW" ] [ "users", "dependency_schemas_on_users", "DEP_VIEW" ] -[ "schemas", "dependency_schemas_on_users", "DEP_VIEW" ] -[ "functions", "dependency_tables_on_functions", "DEP_VIEW" ] -[ "dependencies", "dependency_tables_on_functions", "DEP_VIEW" ] -[ "tables", "dependency_tables_on_functions", "DEP_VIEW" ] -[ "functions", "dependency_views_on_functions", "DEP_VIEW" ] -[ "dependencies", "dependency_views_on_functions", "DEP_VIEW" ] -[ "tables", "dependency_views_on_functions", "DEP_VIEW" ] -[ "functions", "dependency_columns_on_functions", "DEP_VIEW" ] -[ "dependencies", "dependency_columns_on_functions", "DEP_VIEW" ] -[ "columns", "dependency_columns_on_functions", "DEP_VIEW" ] -[ "functions", "dependency_functions_on_functions", "DEP_VIEW" ] -[ "dependencies", "dependency_functions_on_functions", "DEP_VIEW" ] -[ "triggers", "dependency_tables_on_triggers", "DEP_VIEW" ] -[ "tables", "dependency_tables_on_triggers", "DEP_VIEW" ] -[ "dependencies", "dependency_tables_on_triggers", "DEP_VIEW" ] -[ "dependencies", "dependency_columns_on_triggers", "DEP_VIEW" ] -[ "triggers", "dependency_columns_on_triggers", "DEP_VIEW" ] -[ "columns", "dependency_columns_on_triggers", "DEP_VIEW" ] -[ "tables", "dependency_columns_on_triggers", "DEP_VIEW" ] -[ "dependencies", "dependency_functions_on_triggers", "DEP_VIEW" ] -[ "triggers", "dependency_functions_on_triggers", "DEP_VIEW" ] -[ "functions", "dependency_functions_on_triggers", "DEP_VIEW" ] -[ "idxs", "dependency_tables_on_indexes", "DEP_VIEW" ] -[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ] -[ "keys", "dependency_tables_on_indexes", "DEP_VIEW" ] -[ "columns", "dependency_columns_on_indexes", "DEP_VIEW" ] -[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
