Changeset: 94630ad40adf for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94630ad40adf Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message:
Approve of changes in \d output diffs (truncated from 599 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -55,10 +55,10 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.L14, sys.L16, sys.L20, sys.L22, sys.L24 # table_name +% sys.L6, sys.L10, sys.L12, sys.L14, sys.L16 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type -% 8, 35, 2, 14, 611 # length +% 8, 35, 2, 14, 1498 # length [ "bam", "bam_drop_file", 0, "bigint", "create procedure bam.bam_drop_file(file_id bigint, dbschema smallint)\nexternal name bam.bam_drop_file;" ] [ "bam", "bam_drop_file", 1, "smallint", "" ] [ "bam", "bam_export", 0, "clob", "create procedure bam.bam_export(output_path string)\nexternal name bam.bam_export;" ] @@ -615,7 +615,7 @@ Ready. [ "sys", "floor", 1, "real", "" ] [ "sys", "floor", 0, "double", "floor" ] [ "sys", "floor", 1, "double", "" ] -[ "sys", "function_type_keyword", 0, "varchar", "create function sys.function_type_keyword(ftype int)\nreturns varchar(20)\nbegin\n return case ftype\n when 1 then 'FUNCTION'\n when 2 then 'PROCEDURE'\n when 3 then 'AGGREGATE'\n when 4 then 'FILTER FUNCTION'\n when 7 then 'LOADER'\n else 'ROUTINE'\n end;\nend;" ] +[ "sys", "function_type_keyword", 0, "varchar", "create function sys.function_type_keyword(ftype int)\nreturns varchar(20)\nbegin\n return case ftype\n when 1 then 'FUNCTION'\n when 2 then 'PROCEDURE'\n when 3 then 'AGGREGATE'\n when 4 then 'FILTER FUNCTION'\n when 5 then 'FUNCTION' \n when 7 then 'LOADER'\n else 'ROUTINE'\n end;\nend;" ] [ "sys", "function_type_keyword", 1, "int", "" ] [ "sys", "fuse", 0, "smallint", "create function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -55,10 +55,10 @@ Ready. # 16:20:25 > #select s.name as "schema", f.name as "function", a.number as "argno", a.type as "argtype", case a.number when 0 then f.func else '' end as "definition" from sys.functions f, sys.schemas s, sys.args a where s.id = f.schema_id and f.id = a.func_id and f.id in (select * from sys.systemfunctions) order by s.name, f.name, f.id, a.number; -% sys.L14, sys.L16, sys.L20, sys.L22, sys.L24 # table_name +% sys.L6, sys.L10, sys.L12, sys.L14, sys.L16 # table_name % schema, function, argno, argtype, definition # name % varchar, varchar, int, varchar, varchar # type -% 8, 35, 2, 14, 611 # length +% 8, 35, 2, 14, 1498 # length [ "bam", "bam_drop_file", 0, "bigint", "create procedure bam.bam_drop_file(file_id bigint, dbschema smallint)\nexternal name bam.bam_drop_file;" ] [ "bam", "bam_drop_file", 1, "smallint", "" ] [ "bam", "bam_export", 0, "clob", "create procedure bam.bam_export(output_path string)\nexternal name bam.bam_export;" ] @@ -649,7 +649,7 @@ Ready. [ "sys", "floor", 1, "real", "" ] [ "sys", "floor", 0, "double", "floor" ] [ "sys", "floor", 1, "double", "" ] -[ "sys", "function_type_keyword", 0, "varchar", "create function sys.function_type_keyword(ftype int)\nreturns varchar(20)\nbegin\n return case ftype\n when 1 then 'FUNCTION'\n when 2 then 'PROCEDURE'\n when 3 then 'AGGREGATE'\n when 4 then 'FILTER FUNCTION'\n when 7 then 'LOADER'\n else 'ROUTINE'\n end;\nend;" ] +[ "sys", "function_type_keyword", 0, "varchar", "create function sys.function_type_keyword(ftype int)\nreturns varchar(20)\nbegin\n return case ftype\n when 1 then 'FUNCTION'\n when 2 then 'PROCEDURE'\n when 3 then 'AGGREGATE'\n when 4 then 'FILTER FUNCTION'\n when 5 then 'FUNCTION' \n when 7 then 'LOADER'\n else 'ROUTINE'\n end;\nend;" ] [ "sys", "function_type_keyword", 1, "int", "" ] [ "sys", "fuse", 0, "smallint", "create function fuse(one tinyint, two tinyint)\nreturns smallint external name udf.fuse;" ] [ "sys", "fuse", 1, "tinyint", "" ] diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -416,7 +416,7 @@ SYSTEM FUNCTION sys.ascii SYSTEM FUNCTION sys.asin SYSTEM FUNCTION sys.atan SYSTEM AGGREGATE sys.avg -SYSTEM ROUTINE sys.bbp +SYSTEM FUNCTION sys.bbp SYSTEM FUNCTION sys.bit_and SYSTEM FUNCTION sys.bit_not SYSTEM FUNCTION sys.bit_or @@ -433,7 +433,7 @@ SYSTEM FUNCTION sys.columnsize SYSTEM PROCEDURE sys.comment_on SYSTEM FUNCTION sys.concat SYSTEM FUNCTION sys.contains -SYSTEM ROUTINE sys.copyfrom +SYSTEM FUNCTION sys.copyfrom SYSTEM AGGREGATE sys.corr SYSTEM FUNCTION sys.cos SYSTEM FUNCTION sys.cosh @@ -451,34 +451,34 @@ SYSTEM FUNCTION sys.day SYSTEM FUNCTION sys.dayofmonth SYSTEM FUNCTION sys.dayofweek SYSTEM FUNCTION sys.dayofyear -SYSTEM ROUTINE sys.db_users +SYSTEM FUNCTION sys.db_users SYSTEM FUNCTION sys.debug SYSTEM FUNCTION sys.degrees SYSTEM ROUTINE sys.dense_rank -SYSTEM ROUTINE sys.dependencies_columns_on_functions -SYSTEM ROUTINE sys.dependencies_columns_on_indexes -SYSTEM ROUTINE sys.dependencies_columns_on_keys -SYSTEM ROUTINE sys.dependencies_columns_on_triggers -SYSTEM ROUTINE sys.dependencies_columns_on_views -SYSTEM ROUTINE sys.dependencies_functions_on_functions -SYSTEM ROUTINE sys.dependencies_functions_os_triggers -SYSTEM ROUTINE sys.dependencies_keys_on_foreignkeys -SYSTEM ROUTINE sys.dependencies_owners_on_schemas -SYSTEM ROUTINE sys.dependencies_schemas_on_users -SYSTEM ROUTINE sys.dependencies_tables_on_foreignkeys -SYSTEM ROUTINE sys.dependencies_tables_on_functions -SYSTEM ROUTINE sys.dependencies_tables_on_indexes -SYSTEM ROUTINE sys.dependencies_tables_on_triggers -SYSTEM ROUTINE sys.dependencies_tables_on_views -SYSTEM ROUTINE sys.dependencies_views_on_functions -SYSTEM ROUTINE sys.dependencies_views_on_triggers -SYSTEM ROUTINE sys.describe_all_objects +SYSTEM FUNCTION sys.dependencies_columns_on_functions +SYSTEM FUNCTION sys.dependencies_columns_on_indexes +SYSTEM FUNCTION sys.dependencies_columns_on_keys +SYSTEM FUNCTION sys.dependencies_columns_on_triggers +SYSTEM FUNCTION sys.dependencies_columns_on_views +SYSTEM FUNCTION sys.dependencies_functions_on_functions +SYSTEM FUNCTION sys.dependencies_functions_os_triggers +SYSTEM FUNCTION sys.dependencies_keys_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_owners_on_schemas +SYSTEM FUNCTION sys.dependencies_schemas_on_users +SYSTEM FUNCTION sys.dependencies_tables_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_tables_on_functions +SYSTEM FUNCTION sys.dependencies_tables_on_indexes +SYSTEM FUNCTION sys.dependencies_tables_on_triggers +SYSTEM FUNCTION sys.dependencies_tables_on_views +SYSTEM FUNCTION sys.dependencies_views_on_functions +SYSTEM FUNCTION sys.dependencies_views_on_triggers +SYSTEM FUNCTION sys.describe_all_objects SYSTEM ROUTINE sys.diff SYSTEM FUNCTION sys.difference SYSTEM PROCEDURE sys.droporderindex SYSTEM FUNCTION sys.editdistance SYSTEM FUNCTION sys.editdistance2 -SYSTEM ROUTINE sys.env +SYSTEM FUNCTION sys.env SYSTEM FUNCTION sys.epoch SYSTEM PROCEDURE sys.evalalgebra SYSTEM AGGREGATE sys.exist @@ -489,7 +489,7 @@ SYSTEM FUNCTION sys.floor SYSTEM PROCEDURE sys.flush_log SYSTEM FUNCTION sys.function_type_keyword SYSTEM FUNCTION sys.fuse -SYSTEM ROUTINE sys.generate_series +SYSTEM FUNCTION sys.generate_series SYSTEM FUNCTION sys.geometrytype SYSTEM FUNCTION sys.get_type SYSTEM FUNCTION sys.get_value_for @@ -547,7 +547,7 @@ SYSTEM FUNCTION sys.log10 SYSTEM FUNCTION sys.lower SYSTEM FUNCTION sys.lpad SYSTEM FUNCTION sys.ltrim -SYSTEM ROUTINE sys.malfunctions +SYSTEM FUNCTION sys.malfunctions SYSTEM FUNCTION sys.masklen SYSTEM PROCEDURE sys.master SYSTEM PROCEDURE sys.masterbeat @@ -591,8 +591,8 @@ SYSTEM FUNCTION sys.not_like SYSTEM AGGREGATE sys.not_unique SYSTEM FUNCTION sys.not_uniques SYSTEM FUNCTION sys.octet_length -SYSTEM ROUTINE sys.optimizer_stats -SYSTEM ROUTINE sys.optimizers +SYSTEM FUNCTION sys.optimizer_stats +SYSTEM FUNCTION sys.optimizers SYSTEM FUNCTION sys.or SYSTEM FUNCTION sys.password_hash SYSTEM FUNCTION sys.patindex @@ -603,18 +603,18 @@ SYSTEM AGGREGATE sys.prod SYSTEM FUNCTION sys.qgramnormalize SYSTEM AGGREGATE sys.quantile SYSTEM FUNCTION sys.quarter -SYSTEM ROUTINE sys.querycache +SYSTEM FUNCTION sys.querycache SYSTEM PROCEDURE sys.querylog -SYSTEM ROUTINE sys.querylog_calls -SYSTEM ROUTINE sys.querylog_catalog +SYSTEM FUNCTION sys.querylog_calls +SYSTEM FUNCTION sys.querylog_catalog SYSTEM PROCEDURE sys.querylog_disable SYSTEM PROCEDURE sys.querylog_empty SYSTEM PROCEDURE sys.querylog_enable -SYSTEM ROUTINE sys.queue +SYSTEM FUNCTION sys.queue SYSTEM FUNCTION sys.radians SYSTEM FUNCTION sys.rand SYSTEM ROUTINE sys.rank -SYSTEM ROUTINE sys.rejects +SYSTEM FUNCTION sys.rejects SYSTEM FUNCTION sys.repeat SYSTEM FUNCTION sys.replace SYSTEM PROCEDURE sys.replicabeat @@ -637,7 +637,7 @@ SYSTEM FUNCTION sys.rtrim SYSTEM FUNCTION sys.scale_down SYSTEM FUNCTION sys.scale_up SYSTEM FUNCTION sys.second -SYSTEM ROUTINE sys.sessions +SYSTEM FUNCTION sys.sessions SYSTEM FUNCTION sys.setmasklen SYSTEM PROCEDURE sys.setsession SYSTEM PROCEDURE sys.settimeout @@ -684,8 +684,8 @@ SYSTEM FUNCTION sys.st_difference SYSTEM FUNCTION sys.st_dimension SYSTEM FUNCTION sys.st_disjoint SYSTEM FUNCTION sys.st_distance -SYSTEM ROUTINE sys.st_dump -SYSTEM ROUTINE sys.st_dumppoints +SYSTEM FUNCTION sys.st_dump +SYSTEM FUNCTION sys.st_dumppoints SYSTEM FUNCTION sys.st_dwithin SYSTEM FUNCTION sys.st_endpoint SYSTEM FUNCTION sys.st_envelope @@ -762,8 +762,8 @@ SYSTEM AGGREGATE sys.stddev_pop SYSTEM AGGREGATE sys.stddev_samp SYSTEM PROCEDURE sys.stop SYSTEM PROCEDURE sys.stopmaster -SYSTEM ROUTINE sys.storage -SYSTEM ROUTINE sys.storagemodel +SYSTEM FUNCTION sys.storage +SYSTEM FUNCTION sys.storagemodel SYSTEM PROCEDURE sys.storagemodelinit SYSTEM FUNCTION sys.str_to_date SYSTEM FUNCTION sys.str_to_time @@ -780,14 +780,14 @@ SYSTEM FUNCTION sys.text SYSTEM FUNCTION sys.time_to_str SYSTEM PROCEDURE sys.times SYSTEM FUNCTION sys.timestamp_to_str -SYSTEM ROUTINE sys.tracelog +SYSTEM FUNCTION sys.tracelog SYSTEM FUNCTION sys.trim SYSTEM FUNCTION sys.truncate SYSTEM FUNCTION sys.ucase SYSTEM FUNCTION sys.upper SYSTEM FUNCTION sys.uuid SYSTEM PROCEDURE sys.vacuum -SYSTEM ROUTINE sys.var +SYSTEM FUNCTION sys.var SYSTEM AGGREGATE sys.var_pop SYSTEM AGGREGATE sys.var_samp SYSTEM FUNCTION sys.week diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -420,7 +420,7 @@ SYSTEM FUNCTION sys.ascii SYSTEM FUNCTION sys.asin SYSTEM FUNCTION sys.atan SYSTEM AGGREGATE sys.avg -SYSTEM ROUTINE sys.bbp +SYSTEM FUNCTION sys.bbp SYSTEM FUNCTION sys.bit_and SYSTEM FUNCTION sys.bit_not SYSTEM FUNCTION sys.bit_or @@ -437,7 +437,7 @@ SYSTEM FUNCTION sys.columnsize SYSTEM PROCEDURE sys.comment_on SYSTEM FUNCTION sys.concat SYSTEM FUNCTION sys.contains -SYSTEM ROUTINE sys.copyfrom +SYSTEM FUNCTION sys.copyfrom SYSTEM AGGREGATE sys.corr SYSTEM FUNCTION sys.cos SYSTEM FUNCTION sys.cosh @@ -455,34 +455,34 @@ SYSTEM FUNCTION sys.day SYSTEM FUNCTION sys.dayofmonth SYSTEM FUNCTION sys.dayofweek SYSTEM FUNCTION sys.dayofyear -SYSTEM ROUTINE sys.db_users +SYSTEM FUNCTION sys.db_users SYSTEM FUNCTION sys.debug SYSTEM FUNCTION sys.degrees SYSTEM ROUTINE sys.dense_rank -SYSTEM ROUTINE sys.dependencies_columns_on_functions -SYSTEM ROUTINE sys.dependencies_columns_on_indexes -SYSTEM ROUTINE sys.dependencies_columns_on_keys -SYSTEM ROUTINE sys.dependencies_columns_on_triggers -SYSTEM ROUTINE sys.dependencies_columns_on_views -SYSTEM ROUTINE sys.dependencies_functions_on_functions -SYSTEM ROUTINE sys.dependencies_functions_os_triggers -SYSTEM ROUTINE sys.dependencies_keys_on_foreignkeys -SYSTEM ROUTINE sys.dependencies_owners_on_schemas -SYSTEM ROUTINE sys.dependencies_schemas_on_users -SYSTEM ROUTINE sys.dependencies_tables_on_foreignkeys -SYSTEM ROUTINE sys.dependencies_tables_on_functions -SYSTEM ROUTINE sys.dependencies_tables_on_indexes -SYSTEM ROUTINE sys.dependencies_tables_on_triggers -SYSTEM ROUTINE sys.dependencies_tables_on_views -SYSTEM ROUTINE sys.dependencies_views_on_functions -SYSTEM ROUTINE sys.dependencies_views_on_triggers -SYSTEM ROUTINE sys.describe_all_objects +SYSTEM FUNCTION sys.dependencies_columns_on_functions +SYSTEM FUNCTION sys.dependencies_columns_on_indexes +SYSTEM FUNCTION sys.dependencies_columns_on_keys +SYSTEM FUNCTION sys.dependencies_columns_on_triggers +SYSTEM FUNCTION sys.dependencies_columns_on_views +SYSTEM FUNCTION sys.dependencies_functions_on_functions +SYSTEM FUNCTION sys.dependencies_functions_os_triggers +SYSTEM FUNCTION sys.dependencies_keys_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_owners_on_schemas +SYSTEM FUNCTION sys.dependencies_schemas_on_users +SYSTEM FUNCTION sys.dependencies_tables_on_foreignkeys +SYSTEM FUNCTION sys.dependencies_tables_on_functions +SYSTEM FUNCTION sys.dependencies_tables_on_indexes +SYSTEM FUNCTION sys.dependencies_tables_on_triggers +SYSTEM FUNCTION sys.dependencies_tables_on_views +SYSTEM FUNCTION sys.dependencies_views_on_functions +SYSTEM FUNCTION sys.dependencies_views_on_triggers +SYSTEM FUNCTION sys.describe_all_objects SYSTEM ROUTINE sys.diff SYSTEM FUNCTION sys.difference SYSTEM PROCEDURE sys.droporderindex SYSTEM FUNCTION sys.editdistance SYSTEM FUNCTION sys.editdistance2 -SYSTEM ROUTINE sys.env +SYSTEM FUNCTION sys.env _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
