Changeset: 00ad1049b598 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00ad1049b598 Modified Files: sql/test/Dependencies/Tests/All sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 Branch: geo Log Message:
approved Dependencies and dependency_loop diffs (truncated from 621 to 300 lines): diff --git a/sql/test/Dependencies/Tests/All b/sql/test/Dependencies/Tests/All --- a/sql/test/Dependencies/Tests/All +++ b/sql/test/Dependencies/Tests/All @@ -1,2 +1,2 @@ -HAVE_SAMTOOLS?Dependencies +HAVE_GEOM&HAVE_SAMTOOLS?Dependencies dependency_loop diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.err b/sql/test/Dependencies/Tests/Dependencies.stable.err --- a/sql/test/Dependencies/Tests/Dependencies.stable.err +++ b/sql/test/Dependencies/Tests/Dependencies.stable.err @@ -29,55 +29,55 @@ stderr of test 'Dependencies` in directo # 09:38:22 > "/usr/bin/python2" "Dependencies.SQL.py" "Dependencies" # 09:38:22 > -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP USER monetdb; ERROR = !DROP USER: 'monetdb' owns a schema -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP SCHEMA test; ERROR = !DROP SCHEMA: unable to drop schema 'test' (there are database objects which depend on it -MAPI = (monet_test) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monet_test) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = CREATE SCHEMA "test_2" AUTHORIZATION "public"; ERROR = !CREATE SCHEMA: insufficient privileges for user 'monet_test' -MAPI = (monet_test) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monet_test) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP USER monetdb; ERROR = !DROP USER: 'monetdb' owns a schema -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = CREATE INDEX id_age_index ON v1(id,age); ERROR = !CREATE INDEX: cannot create index on view 'v1' -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = ALTER TABLE t1 DROP COLUMN id; ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = ALTER TABLE v1 DROP COLUMN age; ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1' -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = ALTER TABLE t2 ADD FOREIGN KEY(age_v1) REFERENCES v1(age); ERROR = !CONSTRAINT FOREIGN KEY: could not find referenced PRIMARY KEY in table 'v1' -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP TABLE t1; ERROR = !DROP TABLE: FOREIGN KEY t2.t2_id_t1_fkey depends on t1 -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP VIEW v1; ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP TABLE t2; ERROR = !DROP TABLE: unable to drop table t2 (there are database objects which depend on it) -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP FUNCTION f1; ERROR = !DROP FUNCTION: there are database objects dependent on function f1; -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP INDEX id_age_index; ERROR = !DROP INDEX: no such index 'id_age_index' -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP VIEW v1; ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP TABLE t1; ERROR = !DROP TABLE: unable to drop table t1 (there are database objects which depend on it) -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP function f1; ERROR = !DROP FUNCTION: there are database objects dependent on function f1; -MAPI = (monetdb) /var/tmp/mtest-6347/.s.monetdb.38541 +MAPI = (monetdb) /var/tmp/mtest-18438/.s.monetdb.37353 QUERY = DROP SCHEMA test_2; ERROR = !DROP SCHEMA: name test_2 does not exist 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 @@ -96,7 +96,12 @@ Dependencies between database objects % .t, .v, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 2, 2, 8 # length +% 11, 16, 8 # length +[ "environment", "geometry_columns", "DEP_VIEW" ] +[ "tables", "geometry_columns", "DEP_VIEW" ] +[ "columns", "geometry_columns", "DEP_VIEW" ] +[ "types", "geometry_columns", "DEP_VIEW" ] +[ "schemas", "geometry_columns", "DEP_VIEW" ] [ "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; @@ -155,6 +160,7 @@ Dependencies between database objects [ "objects", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "schemas", "dependencies_schemas_on_users", "DEP_FUNC" ] +[ "spatial_ref_sys", "getproj4", "DEP_FUNC" ] [ "storagemodelinput", "storagemodel", "DEP_FUNC" ] [ "t1", "f2", "DEP_FUNC" ] [ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] @@ -165,7 +171,11 @@ Dependencies between database objects % .c, .v, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 4, 2, 8 # length +% 10, 16, 8 # length +[ "sqlname", "geometry_columns", "DEP_VIEW" ] +[ "systemname", "geometry_columns", "DEP_VIEW" ] +[ "id", "geometry_columns", "DEP_VIEW" ] +[ "name", "geometry_columns", "DEP_VIEW" ] [ "id", "v1", "DEP_VIEW" ] [ "name", "v1", "DEP_VIEW" ] [ "age", "v1", "DEP_VIEW" ] @@ -173,7 +183,8 @@ Dependencies between database objects % .c, .k, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 7, 18, 7 # length +% 7, 25, 7 # length +[ "srid", "spatial_ref_sys_srid_pkey", "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" ] @@ -268,12 +279,14 @@ Dependencies between database objects [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "name", "f2", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] [ "rkey", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rkey", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] [ "rkey", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] [ "schema", "storagemodel", "DEP_FUNC" ] [ "sorted", "storagemodel", "DEP_FUNC" ] +[ "srid", "getproj4", "DEP_FUNC" ] [ "table", "storagemodel", "DEP_FUNC" ] [ "table_id", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "table_id", "dependencies_columns_on_keys", "DEP_FUNC" ] @@ -324,7 +337,7 @@ Dependencies between database objects % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 31, 8 # length +% 17, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] @@ -345,6 +358,7 @@ Dependencies between database objects [ "<", "f2", "DEP_FUNC" ] [ ">", "f2", "DEP_FUNC" ] [ "f1", "f2", "DEP_FUNC" ] +[ "zero_or_one", "getproj4", "DEP_FUNC" ] [ "=", "hashsize", "DEP_FUNC" ] [ "sql_mul", "hashsize", "DEP_FUNC" ] [ "<>", "heapsize", "DEP_FUNC" ] @@ -371,6 +385,14 @@ Dependencies between database objects [ "pi", "radians", "DEP_FUNC" ] [ "sql_div", "radians", "DEP_FUNC" ] [ "sql_mul", "radians", "DEP_FUNC" ] +[ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] +[ "st_geometryn", "st_patchn", "DEP_FUNC" ] +[ "getproj4", "st_transform", "DEP_FUNC" ] +[ "internaltransform", "st_transform", "DEP_FUNC" ] +[ "isnull", "st_transform", "DEP_FUNC" ] +[ "not", "st_transform", "DEP_FUNC" ] +[ "or", "st_transform", "DEP_FUNC" ] +[ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] [ "heapsize", "storagemodel", "DEP_FUNC" ] @@ -439,7 +461,7 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 31, 8 # length +% 17, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] @@ -463,6 +485,7 @@ Dependencies between functions with same [ "f1", "f2", "DEP_FUNC" ] [ "<", "f3", "DEP_FUNC" ] [ "f1", "f3", "DEP_FUNC" ] +[ "zero_or_one", "getproj4", "DEP_FUNC" ] [ "=", "hashsize", "DEP_FUNC" ] [ "sql_mul", "hashsize", "DEP_FUNC" ] [ "<>", "heapsize", "DEP_FUNC" ] @@ -489,6 +512,14 @@ Dependencies between functions with same [ "pi", "radians", "DEP_FUNC" ] [ "sql_div", "radians", "DEP_FUNC" ] [ "sql_mul", "radians", "DEP_FUNC" ] +[ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] +[ "st_geometryn", "st_patchn", "DEP_FUNC" ] +[ "getproj4", "st_transform", "DEP_FUNC" ] +[ "internaltransform", "st_transform", "DEP_FUNC" ] +[ "isnull", "st_transform", "DEP_FUNC" ] +[ "not", "st_transform", "DEP_FUNC" ] +[ "or", "st_transform", "DEP_FUNC" ] +[ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] [ "heapsize", "storagemodel", "DEP_FUNC" ] @@ -500,7 +531,7 @@ Dependencies between functions with same % sys.f1, sys.f2, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 15, 31, 8 # length +% 17, 31, 8 # length [ "=", "columnsize", "DEP_FUNC" ] [ "left_shift", "columnsize", "DEP_FUNC" ] [ "sql_mul", "columnsize", "DEP_FUNC" ] @@ -514,6 +545,7 @@ Dependencies between functions with same [ "hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rotate_xor_hash", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "sql_neg", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "zero_or_one", "getproj4", "DEP_FUNC" ] [ "=", "hashsize", "DEP_FUNC" ] [ "sql_mul", "hashsize", "DEP_FUNC" ] [ "<>", "heapsize", "DEP_FUNC" ] @@ -540,6 +572,14 @@ Dependencies between functions with same [ "pi", "radians", "DEP_FUNC" ] [ "sql_div", "radians", "DEP_FUNC" ] [ "sql_mul", "radians", "DEP_FUNC" ] +[ "st_numgeometries", "st_numpatches", "DEP_FUNC" ] +[ "st_geometryn", "st_patchn", "DEP_FUNC" ] +[ "getproj4", "st_transform", "DEP_FUNC" ] +[ "internaltransform", "st_transform", "DEP_FUNC" ] +[ "isnull", "st_transform", "DEP_FUNC" ] +[ "not", "st_transform", "DEP_FUNC" ] +[ "or", "st_transform", "DEP_FUNC" ] +[ "st_srid", "st_transform", "DEP_FUNC" ] [ "columnsize", "storagemodel", "DEP_FUNC" ] [ "hashsize", "storagemodel", "DEP_FUNC" ] [ "heapsize", "storagemodel", "DEP_FUNC" ] @@ -577,7 +617,12 @@ Cleanup % .t, .v, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 0, 0, 8 # length +% 11, 16, 8 # length +[ "environment", "geometry_columns", "DEP_VIEW" ] +[ "tables", "geometry_columns", "DEP_VIEW" ] +[ "columns", "geometry_columns", "DEP_VIEW" ] +[ "types", "geometry_columns", "DEP_VIEW" ] +[ "schemas", "geometry_columns", "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; % .t, .i, .L4 # table_name % name, name, L4 # name @@ -628,6 +673,7 @@ Cleanup [ "objects", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "schemas", "dependencies_schemas_on_users", "DEP_FUNC" ] +[ "spatial_ref_sys", "getproj4", "DEP_FUNC" ] [ "storagemodelinput", "storagemodel", "DEP_FUNC" ] [ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] [ "triggers", "dependencies_functions_os_triggers", "DEP_FUNC" ] @@ -637,12 +683,17 @@ Cleanup % .c, .v, .L # table_name % name, name, single_value # name % varchar, varchar, char # type -% 0, 0, 8 # length +% 10, 16, 8 # length +[ "sqlname", "geometry_columns", "DEP_VIEW" ] +[ "systemname", "geometry_columns", "DEP_VIEW" ] +[ "id", "geometry_columns", "DEP_VIEW" ] +[ "name", "geometry_columns", "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, .L1 # table_name % name, name, L1 # name % varchar, varchar, char # type -% 7, 18, 7 # length +% 7, 25, 7 # length +[ "srid", "spatial_ref_sys_srid_pkey", "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" ] @@ -733,12 +784,14 @@ Cleanup [ "name", "dependencies_views_on_functions", "DEP_FUNC" ] [ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] [ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "proj4text", "getproj4", "DEP_FUNC" ] [ "reference", "storagemodel", "DEP_FUNC" ] [ "rkey", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "rkey", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] [ "rkey", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] [ "schema", "storagemodel", "DEP_FUNC" ] [ "sorted", "storagemodel", "DEP_FUNC" ] +[ "srid", "getproj4", "DEP_FUNC" ] [ "table", "storagemodel", "DEP_FUNC" ] [ "table_id", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "table_id", "dependencies_columns_on_keys", "DEP_FUNC" ] @@ -784,7 +837,7 @@ Cleanup _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
