Changeset: af5901f68578 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af5901f68578 Branch: default Log Message:
merged diffs (135 lines): diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backends/monet5/sql_upgrades.c --- a/sql/backends/monet5/sql_upgrades.c +++ b/sql/backends/monet5/sql_upgrades.c @@ -3208,36 +3208,36 @@ sql_update_default(Client c, mvc *sql, c " (\n" " (\n" " type = (select function_type_id from sys.function_types where function_type_name = 'Function returning a table') AND\n" - " (\n" - " name = 'dump_database' OR\n" - " name = 'describe_table' OR\n" - " name = 'describe_columns' OR\n" - " name = 'describe_function'\n" + " name in (\n" + " 'dump_database',\n" + " 'describe_table',\n" + " 'describe_columns',\n" + " 'describe_function'\n" " )\n" " ) OR\n" " (\n" " type = (select function_type_id from sys.function_types where function_type_name = 'Scalar function') AND\n" - " (\n" - " name = 'sq' OR\n" - " name = 'dq' OR\n" - " name = 'fqn' OR\n" - " name = 'alter_table' OR\n" - " name = 'replace_first' OR\n" - " name = 'schema_guard' OR\n" - " name = 'get_merge_table_partition_expressions' OR\n" - " name = 'get_remote_table_expressions' OR\n" - " name = 'esc' OR\n" - " name = 'prepare_esc' OR\n" - " name = 'current_size_dump_statements' OR\n" - " name = 'describe_type'\n" + " name in (\n" + " 'sq',\n" + " 'dq',\n" + " 'fqn',\n" + " 'alter_table',\n" + " 'replace_first',\n" + " 'schema_guard',\n" + " 'get_merge_table_partition_expressions',\n" + " 'get_remote_table_expressions',\n" + " 'esc',\n" + " 'prepare_esc',\n" + " 'current_size_dump_statements',\n" + " 'describe_type'\n" " )\n" " ) OR\n" " (\n" " type = (select function_type_id from sys.function_types where function_type_keyword = 'PROCEDURE') AND\n" - " (\n" - " name = 'eval' OR\n" - " name = '_dump_table_data' OR\n" - " name = 'dump_table_data'\n" + " name in (\n" + " 'eval',\n" + " '_dump_table_data',\n" + " 'dump_table_data'\n" " )\n" " )\n" ");\n" @@ -3251,39 +3251,39 @@ sql_update_default(Client c, mvc *sql, c " ) OR\n" " (\n" " type = (select table_type_id from sys.table_types where table_type_name = 'VIEW') AND\n" - " (\n" - " name = 'describe_constraints' OR\n" - " name = 'describe_indices' OR\n" - " name = 'describe_column_defaults' OR\n" - " name = 'describe_foreign_keys' OR\n" - " name = 'describe_tables' OR\n" - " name = 'describe_triggers' OR\n" - " name = 'describe_comments' OR\n" - " name = 'fully_qualified_functions' OR\n" - " name = 'describe_privileges' OR\n" - " name = 'describe_user_defined_types' OR\n" - " name = 'describe_partition_tables' OR\n" - " name = 'describe_sequences' OR \n" - " name = 'describe_functions' OR\n" - " name = 'dump_create_roles' OR\n" - " name = 'dump_create_users' OR\n" - " name = 'dump_create_schemas' OR\n" - " name = 'dump_add_schemas_to_users' OR\n" - " name = 'dump_grant_user_privileges' OR\n" - " name = 'dump_table_constraint_type' OR\n" - " name = 'dump_indices' OR\n" - " name = 'dump_column_defaults' OR\n" - " name = 'dump_foreign_keys' OR\n" - " name = 'dump_partition_tables' OR\n" - " name = 'dump_sequences' OR\n" - " name = 'dump_start_sequences' OR\n" - " name = 'dump_functions' OR\n" - " name = 'dump_tables' OR\n" - " name = 'dump_triggers' OR\n" - " name = 'dump_comments' OR\n" - " name = 'dump_user_defined_types' OR\n" - " name = 'dump_privileges' OR\n" - " name = 'dump_statements')\n" + " name in (\n" + " 'describe_constraints',\n" + " 'describe_indices',\n" + " 'describe_column_defaults',\n" + " 'describe_foreign_keys',\n" + " 'describe_tables',\n" + " 'describe_triggers',\n" + " 'describe_comments',\n" + " 'fully_qualified_functions',\n" + " 'describe_privileges',\n" + " 'describe_user_defined_types',\n" + " 'describe_partition_tables',\n" + " 'describe_sequences',\n" + " 'describe_functions',\n" + " 'dump_create_roles',\n" + " 'dump_create_users',\n" + " 'dump_create_schemas',\n" + " 'dump_add_schemas_to_users',\n" + " 'dump_grant_user_privileges',\n" + " 'dump_table_constraint_type',\n" + " 'dump_indices',\n" + " 'dump_column_defaults',\n" + " 'dump_foreign_keys',\n" + " 'dump_partition_tables',\n" + " 'dump_sequences',\n" + " 'dump_start_sequences',\n" + " 'dump_functions',\n" + " 'dump_tables',\n" + " 'dump_triggers',\n" + " 'dump_comments',\n" + " 'dump_user_defined_types',\n" + " 'dump_privileges',\n" + " 'dump_statements')\n" " )\n" " );\n"); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list