Changeset: d649e349472f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d649e349472f Modified Files: sql/src/test/Dependencies/Tests/Dependencies.stable.out sql/src/test/Dependencies/dependency_DBobjects.sql sql/src/test/Dependencies/dependency_owner_schema_3.sql Branch: Oct2010 Log Message:
add ORDER BY to avoid ambiguous output order (e.g., on Darwin) diffs (241 lines): diff -r 66bf71fb00b9 -r d649e349472f sql/src/test/Dependencies/Tests/Dependencies.stable.out --- a/sql/src/test/Dependencies/Tests/Dependencies.stable.out Sat Oct 30 11:42:30 2010 +0200 +++ b/sql/src/test/Dependencies/Tests/Dependencies.stable.out Sat Oct 30 12:08:27 2010 +0200 @@ -128,38 +128,38 @@ % name, name, single_value # name % varchar, varchar, char # type % 12, 35, 8 # length +[ "auths", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "dependencies", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "dependencies", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "functions", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "functions", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "idxs", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "idxs", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "keycolumns", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "keycolumns", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "keys", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "keys", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "keys", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] +[ "keys", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "keys", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "schemas", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "auths", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "keys", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "idxs", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "t1", "f2", "DEP_FUNC" ] +[ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "triggers", "dependencies_functions_os_triggers", "DEP_FUNC" ] [ "triggers", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "keys", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "functions", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "keycolumns", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "keys", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "keys", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "idxs", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "keycolumns", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "functions", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "functions", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_views_on_functions", "DEP_FUNC" ] [ "triggers", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "functions", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "triggers", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "functions", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "keys", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] -[ "t1", "f2", "DEP_FUNC" ] % .c, .v, . # table_name % name, name, single_value # name % varchar, varchar, char # type @@ -293,20 +293,20 @@ % name, name, single_value # name % varchar, varchar, char # type % 7, 34, 8 # length -[ "users", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "tables", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "tables", "dependencies_tables_on_indexes", "DEP_FUNC" ] [ "tables", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "tables", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_views", "DEP_FUNC" ] [ "tables", "dependencies_views_on_functions", "DEP_FUNC" ] [ "tables", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "users", "dependencies_schemas_on_users", "DEP_FUNC" ] [ "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; % .v, sys.i, . # table_name @@ -443,37 +443,37 @@ % name, name, single_value # name % varchar, varchar, char # type % 12, 35, 8 # length +[ "auths", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "dependencies", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_triggers", "DEP_FUNC" ] +[ "dependencies", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "dependencies", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "dependencies", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "functions", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "functions", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "functions", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "idxs", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "idxs", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "keycolumns", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "keycolumns", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "keys", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "keys", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "keys", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] +[ "keys", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "keys", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] [ "schemas", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "schemas", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "auths", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_views", "DEP_FUNC" ] -[ "keys", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "idxs", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "triggers", "dependencies_functions_os_triggers", "DEP_FUNC" ] [ "triggers", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "keys", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "functions", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "keycolumns", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "keys", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "keys", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "idxs", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "keycolumns", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "functions", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "triggers", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "functions", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "dependencies", "dependencies_views_on_functions", "DEP_FUNC" ] [ "triggers", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "functions", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "triggers", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "dependencies", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "functions", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "keys", "dependencies_keys_on_foreignkeys", "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; % .c, .v, . # table_name % name, name, single_value # name @@ -598,20 +598,20 @@ % name, name, single_value # name % varchar, varchar, char # type % 7, 34, 8 # length -[ "users", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "columns", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "tables", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "tables", "dependencies_tables_on_indexes", "DEP_FUNC" ] [ "tables", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "tables", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "tables", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "columns", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "tables", "dependencies_tables_on_views", "DEP_FUNC" ] [ "tables", "dependencies_views_on_functions", "DEP_FUNC" ] [ "tables", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "users", "dependencies_schemas_on_users", "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; % .v, sys.i, . # table_name % name, name, single_value # name diff -r 66bf71fb00b9 -r d649e349472f sql/src/test/Dependencies/dependency_DBobjects.sql --- a/sql/src/test/Dependencies/dependency_DBobjects.sql Sat Oct 30 11:42:30 2010 +0200 +++ b/sql/src/test/Dependencies/dependency_DBobjects.sql Sat Oct 30 12:08:27 2010 +0200 @@ -81,7 +81,7 @@ 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; --Table t has a dependency on function f -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 = 0; +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 = 0 ORDER BY t.name, f.name; --Column c has a dependency on view v @@ -101,7 +101,7 @@ --View v has a dependency on function f -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 = 1; +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 = 1 ORDER BY v.name, f.name; --View v has a dependency on index i 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; diff -r 66bf71fb00b9 -r d649e349472f sql/src/test/Dependencies/dependency_owner_schema_3.sql --- a/sql/src/test/Dependencies/dependency_owner_schema_3.sql Sat Oct 30 11:42:30 2010 +0200 +++ b/sql/src/test/Dependencies/dependency_owner_schema_3.sql Sat Oct 30 12:08:27 2010 +0200 @@ -28,7 +28,7 @@ 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; --Table t has a dependency on function f -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 = 0; +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 = 0 ORDER BY t.name, f.name; --Column c has a dependency on view v @@ -48,7 +48,7 @@ --View v has a dependency on function f -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 = 1; +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 = 1 ORDER BY v.name, f.name; --View v has a dependency on index i 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; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
