Changeset: 54b56550b84a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54b56550b84a Modified Files: sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/dependency_DBobjects.sql sql/test/Dependencies/dependency_owner_schema_3.sql sql/test/Tests/coalesce.stable.err.single Branch: default Log Message:
Merge with Feb2013 branch. diffs (truncated from 576 to 300 lines): diff --git a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql --- a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql +++ b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql @@ -59,12 +59,12 @@ create function GetTrace() TRACE select x,y from slice_test limit 1; -- When mitosis was activated (i.e., the MAL plan contains mat.*() statements, --- then there sould also be at least one mat.slice() (or mat.pack()) statement. +-- then there sould also be at least one mat.slice() (or mat.pack*()) statement. WITH TheTrace AS ( SELECT * FROM GetTrace() ) SELECT count(*) FROM ( SELECT count(*) AS mat FROM TheTrace WHERE stmt LIKE '% := mat.%' ) as m, ( SELECT count(*) AS mat_slice FROM TheTrace WHERE stmt LIKE '% := mat.slice(%' ) as ms, -( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack(%' ) as mp +( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack%(%' ) as mp WHERE ( mat = 0 AND mat_slice+mat_pack = 0 ) OR ( mat > 0 AND mat_slice+mat_pack > 0 ); TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; @@ -74,7 +74,7 @@ WITH TheTrace AS ( SELECT * FROM GetTrac SELECT count(*) FROM ( SELECT count(*) AS mat FROM TheTrace WHERE stmt LIKE '% := mat.%' ) as m, ( SELECT count(*) AS mat_slice FROM TheTrace WHERE stmt LIKE '% := mat.slice(%' ) as ms, -( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack(%' ) as mp +( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack%(%' ) as mp WHERE ( mat = 0 AND mat_slice+mat_pack = 0 ) OR ( mat > 0 AND mat_slice+mat_pack > 0 ); drop function GetTrace; diff --git a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out --- a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out +++ b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out @@ -111,7 +111,7 @@ Ready. % L4 # name % wrd # type % 1 # length -[ 0 ] +[ 1 ] #TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; % sys. # table_name % concat_concat_x # name @@ -126,7 +126,7 @@ Ready. % L4 # name % wrd # type % 1 # length -[ 0 ] +[ 1 ] #drop function GetTrace; #drop table slice_test; 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 @@ -199,100 +199,100 @@ Dependencies between database objects % varchar, varchar, varchar # type % 2, 8, 9 # length [ "id", "id_index", "DEP_INDEX" ] -#SELECT c.name, f.name,'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7; -% .c, .f, .L1 # table_name -% name, name, L1 # name +#SELECT c.name, f.name, 'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 ORDER BY c.name, f.name; +% .c, .f, . # table_name +% name, name, single_value # name % varchar, varchar, varchar # type % 11, 35, 8 # length -[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "name", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "name", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "name", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "atomwidth", "storagemodel", "DEP_FUNC" ] +[ "column", "storagemodel", "DEP_FUNC" ] +[ "count", "storagemodel", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "depend_id", "dependencies_functions_on_functions", "DEP_FUNC" ] [ "depend_id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_views", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "depend_id", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "depend_id", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "depend_type", "dependencies_functions_on_functions", "DEP_FUNC" ] [ "depend_type", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_views", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "depend_type", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "depend_type", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "distinct", "storagemodel", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "id", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] [ "id", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "id", "dependencies_schemas_on_users", "DEP_FUNC" ] [ "id", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_tables_on_triggers", "DEP_FUNC" ] +[ "id", "dependencies_tables_on_triggers", "DEP_FUNC" ] +[ "id", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "id", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "id", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "id", "f2", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_keys", "DEP_FUNC" ] +[ "name", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "name", "dependencies_functions_on_functions", "DEP_FUNC" ] +[ "name", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "name", "dependencies_functions_os_triggers", "DEP_FUNC" ] +[ "name", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] +[ "name", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "name", "dependencies_owners_on_schemas", "DEP_FUNC" ] +[ "name", "dependencies_schemas_on_users", "DEP_FUNC" ] +[ "name", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] +[ "name", "dependencies_tables_on_functions", "DEP_FUNC" ] +[ "name", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "name", "dependencies_tables_on_indexes", "DEP_FUNC" ] +[ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ] +[ "name", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "name", "f2", "DEP_FUNC" ] +[ "owner", "dependencies_owners_on_schemas", "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" ] +[ "table", "storagemodel", "DEP_FUNC" ] +[ "table_id", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "table_id", "dependencies_columns_on_keys", "DEP_FUNC" ] [ "table_id", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "name", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "rkey", "dependencies_keys_on_foreignkeys", "DEP_FUNC" ] -[ "rkey", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "rkey", "dependencies_tables_on_foreignkeys", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "table_id", "dependencies_columns_on_indexes", "DEP_FUNC" ] [ "table_id", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_indexes", "DEP_FUNC" ] -[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "id", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "name", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "name", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "table_id", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_indexes", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_keys", "DEP_FUNC" ] -[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "name", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "schema", "storagemodel", "DEP_FUNC" ] -[ "table", "storagemodel", "DEP_FUNC" ] -[ "column", "storagemodel", "DEP_FUNC" ] [ "type", "storagemodel", "DEP_FUNC" ] -[ "count", "storagemodel", "DEP_FUNC" ] -[ "distinct", "storagemodel", "DEP_FUNC" ] -[ "atomwidth", "storagemodel", "DEP_FUNC" ] -[ "reference", "storagemodel", "DEP_FUNC" ] -[ "sorted", "storagemodel", "DEP_FUNC" ] -[ "id", "f2", "DEP_FUNC" ] -[ "name", "f2", "DEP_FUNC" ] #SELECT c.name, tri.name, 'DEP_TRIGGER' from columns as c, triggers as tri, dependencies as dep where dep.id = c.id AND dep.depend_id =tri.id AND dep.depend_type = 8; % .c, .tri, .L1 # table_name % name, name, L1 # name @@ -698,98 +698,98 @@ Cleanup % name, name, single_value # name % varchar, varchar, varchar # type % 0, 0, 0 # length -#SELECT c.name, f.name,'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7; -% .c, .f, .L1 # table_name -% name, name, L1 # name +#SELECT c.name, f.name, 'DEP_FUNC' from functions as f, columns as c, dependencies as dep where c.id = dep.id AND f.id = dep.depend_id AND dep.depend_type = 7 ORDER BY c.name, f.name; +% .c, .f, . # table_name +% name, name, single_value # name % varchar, varchar, varchar # type % 11, 35, 8 # length -[ "id", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "name", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "name", "dependencies_schemas_on_users", "DEP_FUNC" ] -[ "owner", "dependencies_owners_on_schemas", "DEP_FUNC" ] -[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "name", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "name", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_columns_on_views", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_functions", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_triggers", "DEP_FUNC" ] -[ "id", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "atomwidth", "storagemodel", "DEP_FUNC" ] +[ "column", "storagemodel", "DEP_FUNC" ] +[ "count", "storagemodel", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "depend_id", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "depend_id", "dependencies_functions_on_functions", "DEP_FUNC" ] [ "depend_id", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "depend_id", "dependencies_columns_on_views", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "depend_id", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "depend_id", "dependencies_views_on_functions", "DEP_FUNC" ] +[ "depend_id", "dependencies_views_on_triggers", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_functions", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_triggers", "DEP_FUNC" ] +[ "depend_type", "dependencies_columns_on_views", "DEP_FUNC" ] +[ "depend_type", "dependencies_functions_on_functions", "DEP_FUNC" ] [ "depend_type", "dependencies_functions_os_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_functions_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_views_on_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_views_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_triggers", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_functions", "DEP_FUNC" ] -[ "depend_type", "dependencies_columns_on_views", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_functions", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_triggers", "DEP_FUNC" ] [ "depend_type", "dependencies_tables_on_views", "DEP_FUNC" ] +[ "depend_type", "dependencies_views_on_functions", "DEP_FUNC" ] _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
