MonetDB: default - Approve upgrade.
Changeset: 844e9ef57ce9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=844e9ef57ce9 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 18360 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -5322,7 +5322,7 @@ create aggregate median(val HUGEINT) ret external name "aggr"."median"; create aggregate quantile(val HUGEINT, q DOUBLE) returns HUGEINT external name "aggr"."quantile"; -create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns HUGEINT +create aggregate corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE external name "aggr"."corr"; create function json.filter(js json, name hugeint) returns json @@ -5350,18 +5350,6 @@ grant execute on function json.filter(js set schema "sys"; Running database upgrade commands: -GRANT SELECT ON sys.keywords TO PUBLIC; -GRANT SELECT ON sys.table_types TO PUBLIC; -GRANT SELECT ON sys.dependency_types TO PUBLIC; -GRANT SELECT ON sys.function_types TO PUBLIC; -GRANT SELECT ON sys.function_languages TO PUBLIC; -GRANT SELECT ON sys.key_types TO PUBLIC; -GRANT SELECT ON sys.index_types TO PUBLIC; -GRANT SELECT ON sys.privilege_codes TO PUBLIC; -GRANT EXECUTE ON FUNCTION sys.environment() TO PUBLIC; -GRANT SELECT ON sys.environment TO PUBLIC; - -Running database upgrade commands: set schema "sys"; create procedure master() external name wlc.master; diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 @@ -62,5239 +62,5239 @@ insert into sys.types values (30, 'mbr', delete from sys.functions where id < 2000; delete from sys.args where func_id not in (select id from sys.functions); insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (7643, 31, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (7644, 31, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (7645, 31, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (7661, 31, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (7662, 31, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (7663, 31, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (7646, 32, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (7647, 32, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (7648, 32, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (7664, 32, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (7665, 32, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (7666, 32, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (7649, 33, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (7650, 33, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (7651, 33, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (7667, 33, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (7668, 33, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (7669, 33, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (7652, 34, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (7653, 34, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (7654, 34, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (7670, 34, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (7671, 34, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (7672, 34, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (7655, 35, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (7656, 35, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (7657, 35, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (7673, 35, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (7674, 35, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args val
MonetDB: default - Approve upgrade.
Changeset: a8c94cfb4faa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a8c94cfb4faa Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 516 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -5374,27 +5374,20 @@ set schema "sys"; Running database upgrade commands: set schema "sys"; -drop view sys.geometry_columns; -create view geometry_columns as - select e.value as f_table_catalog, +drop view sys.geometry_columns cascade; +create view sys.geometry_columns as + select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid, y.type - from schemas s, environment e, ( - select t.schema_id, t.name as f_table_name, - x.name as f_geometry_column, - cast(has_z(info)+has_m(info)+2 as integer) as coord_dimension, - srid, get_type(info, 0) as type - from tables t, ( - select name, table_id, type_digits AS info, type_scale AS srid - from columns - where type in ( select distinct sqlname from types where systemname='wkb') - ) as x - where t.id=x.table_id - ) y - where y.schema_id=s.id and e.name='gdk_dbname'; -GRANT SELECT ON geometry_columns TO PUBLIC; -update sys._tables set system = true where name in ('geometry_columns') and schema_id = (select id from schemas where name = 'sys'); + c.name as f_geometry_column, + cast(has_z(c.type_digits) + has_m(c.type_digits) +2 as integer) as coord_dimension, + c.type_scale as srid, + get_type(c.type_digits, 0) as type + from sys.columns c, sys.tables t, sys.schemas s + where c.table_id = t.id and t.schema_id = s.id + and c.type in (select sqlname from sys.types where systemname in ('wkb', 'wkba')); +GRANT SELECT ON sys.geometry_columns TO PUBLIC; +update sys._tables set system = true where name = 'geometry_columns' and schema_id in (select id from schemas where name = 'sys'); delete from sys.systemfunctions where function_id not in (select id from sys.functions); set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -4661,27 +4661,20 @@ set schema "sys"; Running database upgrade commands: set schema "sys"; -drop view sys.geometry_columns; -create view geometry_columns as - select e.value as f_table_catalog, +drop view sys.geometry_columns cascade; +create view sys.geometry_columns as + select cast(null as varchar(1)) as f_table_catalog, s.name as f_table_schema, - y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid, y.type - from schemas s, environment e, ( - select t.schema_id, t.name as f_table_name, - x.name as f_geometry_column, - cast(has_z(info)+has_m(info)+2 as integer) as coord_dimension, - srid, get_type(info, 0) as type - from tables t, ( - select name, table_id, type_digits AS info, type_scale AS srid - from columns - where type in ( select distinct sqlname from types where systemname='wkb') - ) as x - where t.id=x.table_id - ) y - where y.schema_id=s.id and e.name='gdk_dbname'; -GRANT SELECT ON geometry_columns TO PUBLIC; -update sys._tables set system = true where name in ('geometry_columns') and
MonetDB: default - Approve upgrade.
Changeset: 390850340c7c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/390850340c7c Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 3724 to 300 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -4088,6 +4088,8 @@ update sys.functions set system = true w Running database upgrade commands: drop function sys.dump_database(boolean); +drop procedure sys.dump_table_data(); +drop procedure sys.dump_table_data(string, string); drop view sys.dump_partition_tables; drop view sys.describe_partition_tables; drop view sys.dump_sequences; @@ -4183,14 +4185,65 @@ CREATE VIEW sys.dump_start_sequences AS sch schema_name, seq sequence_name FROM sys.describe_sequences; +CREATE PROCEDURE sys.dump_table_data(sch STRING, tbl STRING) +BEGIN + DECLARE tid INT; + SET tid = (SELECT MIN(t.id) FROM sys.tables t, sys.schemas s WHERE t.name = tbl AND t.schema_id = s.id AND s.name = sch); + IF tid IS NOT NULL THEN +DECLARE k INT; +DECLARE m INT; +SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid); +SET m = (SELECT MAX(c.id) FROM sys.columns c WHERE c.table_id = tid); +IF k IS NOT NULL AND m IS NOT NULL THEN + DECLARE cname STRING; + DECLARE ctype STRING; + DECLARE _cnt INT; + SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k); + SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k); + SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname)); + IF _cnt > 0 THEN +DECLARE COPY_INTO_STMT STRING; +DECLARE SELECT_DATA_STMT STRING; +SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch, tbl) || '(' || sys.DQ(cname); +SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype); +WHILE (k < m) DO + SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.
MonetDB: default - Approve upgrade.
Changeset: 809fb8a9b884 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/809fb8a9b884 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 650 to 300 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -562,3 +562,22 @@ update sys.functions set system = true w update sys.functions set system = true where system <> true and name = 'dump_database' and schema_id = 2000 and type = 5; GRANT SELECT ON sys.describe_tables TO PUBLIC; +Running database upgrade commands: +drop view if exists sys.dependency_tables_on_functions; +drop view if exists sys.dependency_views_on_functions; +CREATE VIEW sys.dependency_tables_on_functions AS +SELECT t.schema_id AS table_schema_id, t.id AS table_id, t.name AS table_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS t, sys.dependencies AS dep + WHERE t.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND t.type NOT IN (1, 11) + ORDER BY t.name, t.schema_id, f.name, f.id; +GRANT SELECT ON sys.dependency_tables_on_functions TO PUBLIC; +CREATE VIEW sys.dependency_views_on_functions AS +SELECT v.schema_id AS view_schema_id, v.id AS view_id, v.name AS view_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS v, sys.dependencies AS dep + WHERE v.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND v.type IN (1, 11) + ORDER BY v.name, v.schema_id, f.name, f.id; +GRANT SELECT ON sys.dependency_views_on_functions TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('dependency_tables_on_functions','dependency_views_on_functions') and schema_id = 2000; + diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out @@ -562,3 +562,22 @@ update sys.functions set system = true w update sys.functions set system = true where system <> true and name = 'dump_database' and schema_id = 2000 and type = 5; GRANT SELECT ON sys.describe_tables TO PUBLIC; +Running database upgrade commands: +drop view if exists sys.dependency_tables_on_functions; +drop view if exists sys.dependency_views_on_functions; +CREATE VIEW sys.dependency_tables_on_functions AS +SELECT t.schema_id AS table_schema_id, t.id AS table_id, t.name AS table_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS t, sys.dependencies AS dep + WHERE t.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND t.type NO
MonetDB: default - Approve upgrade.
Changeset: fb6f5cac224b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/fb6f5cac224b Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve upgrade. diffs (90 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 @@ -339,3 +339,86 @@ create procedure sys.resume(tag bigint, create procedure sys.stop(tag bigint, username string) external name sysmon.stop; update sys.functions set system = true where system <> true and mod = 'sysmon' and name in ('stop', 'pause', 'resume', 'queue'); +Running database upgrade commands: +drop procedure sys.settimeout(bigint) cascade; +drop procedure sys.settimeout(bigint, bigint) cascade; +drop procedure sys.setsession(bigint) cascade; + +Running database upgrade commands: +create function sys.levenshtein(x string, y string) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string) to public; +create function sys.levenshtein(x string, y string, insdel int, rep int) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string, int, int) to public; +create function sys.levenshtein(x string, y string, insdel int, rep int, trans int) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string, int, int, int) to public; +create filter function sys.maxlevenshtein(x string, y string, k int) +external name txtsim."maxlevenshtein"; +create filter function sys.maxlevenshtein(x string, y string, k int, insdel int, rep int) +external name txtsim."maxlevenshtein"; +create filter function minjarowinkler(x string, y string, threshold double) +external name txtsim."minjarowinkler"; +create function sys.dameraulevenshtein(x string, y string) +returns int external name txtsim.dameraulevenshtein; +grant execute on function dameraulevenshtein(string, string) to public; +create function sys.dameraulevenshtein(x string, y string, insdel int, rep int, trans int) +returns int external name txtsim.dameraulevenshtein; +grant execute on function dameraulevenshtein(string, string, int, int, int) to public; +create function sys.editdistance(x string, y string) +returns int external name txtsim.editdistance; +grant execute on function editdistance(string, string) to public; +create function sys.editdistance2(x string, y string) +returns int external name txtsim.editdistance2; +grant execute on function editdistance2(string, string) to public; +create function sys.soundex(x string) +returns string external name txtsim.soundex; +grant execute on function soundex(string) to public; +create function sys.difference(x string, y string) +returns int external name txtsim.stringdiff; +grant execute on function difference(string, string) to public; +create function sys.qgramnormalize(x string) +returns string external name txtsim.qgramnormalize; +grant execute on function qgramnormalize(string) to public; +create function sys.similarity(x string, y string) +returns double external name txtsim.similarity; +grant execute on function similarity(string, string) to public; +create function asciify(x string) +returns string external name str."asciify"; +create function sys.startswith(x string, y string) +returns boolean external name str."startsWith"; +grant execute on function startswith(string, string) to public; +create function sys.startswith(x string, y string, icase boolean) +returns boolean external name str."startsWith"; +grant execute on function startswith(string, string, boolean) to public; +create filter function sys.startswith(x string, y string) +external name str."startsWith"; +create filter function sys.startswith(x string, y string, icase boolean) +external name str."startsWith"; +create function sys.endswith(x string, y string) +returns boolean external name str."endsWith"; +grant execute on function endswith(string, string) to public; +create function sys.endswith(x string, y string, icase boolean) +returns boolean external name str."endsWith"; +grant execute on function endswith(string, string, boolean) to public; +create filter function sys.endswith(s1 string, s2 string) +external name str."endsWith"; +create filter function sys.endswith(s1 string, s2 string, icase boolean) +external name str."endsWith"; +create function sys.contains(x string, y string) +returns boolean external name str."contains"; +grant execute on function contains(string, string) to public; +create function sys.contains(x string, y string, icase boolean) +returns boolean external name str."contains"; +grant execute on function contains(string, string, boolean) to public; +create filter function sys.contains(x string, y string) +external name str."contains"; +
MonetDB: default - Approve upgrade.
Changeset: bb7df589c9f8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb7df589c9f8 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 627 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -73,8 +73,17 @@ create procedure sys.setmemorylimit("ses external name clients.setmemorylimit; create procedure sys.stopsession("sessionid" int) external name clients.stopsession; -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'sessions' and type = 5; -update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'sessions'; +create function sys.prepared_statements() +returns table( +"sessionid" int, +"user" string, +"statementid" int, +"statement" string, +"created" timestamp) + external name sql.prepared_statements; +create view sys.prepared_statements as select * from sys.prepared_statements(); +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements') and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements'); update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout', 'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer', 'stopsession') and type = 2; create function sys.debug(flag string) returns integer external name mdb."setDebug"; @@ -116,7 +125,8 @@ update sys.functions set system = true w update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('pause', 'resume', 'stop') and type = 2; update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; ALTER TABLE sys.keywords SET READ WRITE; -insert into sys.keywords values ('CUBE'), ('GROUPING'), ('ROLLUP'), ('SETS'); +DELETE FROM sys.keywords where "keyword" IN ('NOCYCLE','NOMAXVALUE','NOMINVALUE'); +insert into sys.keywords values ('ANALYZE'),('AT'),('AUTHORIZATION'),('CACHE'),('CENTURY'),('COLUMN'),('CLIENT'),('CUBE'),('CYCLE'),('DATA'),('DATE'),('DEBUG'),('DECADE'),('DEALLOCATE'),('DIAGNOSTICS'),('DISTINCT'),('DOW'),('DOY'),('EXEC'),('EXECUTE'),('EXPLAIN'),('FIRST'),('FWF'),('GROUPING'),('GROUPS'),('INCREMENT'),('INTERVAL'),('KEY'),('LANGUAGE'),('LARGE'),('LAST'),('LATERAL'),('LEVEL'),('LOADER'),('MATCH'),('MATCHED'),('MAXVALUE'),('MINVALUE'),('NAME'),('NO'),('NULLS'),('OBJECT'),('OPTIONS'),('PASSWORD'),('PLAN'),('PRECISION'),('PREP'),('PREPARE'),('QUARTER'),('RELEASE'),('REPLACE'),('ROLLUP'),('SCHEMA'),('SEED'),('SERVER'),('SESSION'),('SETS'),('SIZE'),('STATEMENT'),('TABLE'),('TEMP'),('TEMPORARY'),('TEXT'),('TIME'),('TIMESTAMP'),('TRACE'),('TYPE'),('UNIONJOIN'),('WEEK'),('YEAR'),('ZONE'); commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 @@ -73,8 +73,17 @@ create procedure sys.se
MonetDB: default - Approve upgrade.
Changeset: 1b03169d2ff1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b03169d2ff1 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 494 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -82,8 +82,20 @@ returns table( "created" timestamp) external name sql.prepared_statements; create view sys.prepared_statements as select * from sys.prepared_statements(); -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements') and type = 5; -update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements'); +create function sys.prepared_statements_args() +returns table( +"statementid" int, +"parameter" boolean, +"type" string, +"digits" int, +"scale" int, +"schema" string, +"table" string, +"column" string) + external name sql.prepared_statements_args; +create view sys.prepared_statements_args as select * from sys.prepared_statements_args(); +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements', 'prepared_statements_args') and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements', 'prepared_statements_args'); update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('setoptimizer', 'setquerytimeout', 'setsessiontimeout', 'setworkerlimit', 'setmemorylimit', 'setoptimizer', 'stopsession') and type = 2; create function sys.debug(flag string) returns integer external name mdb."setDebug"; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 @@ -82,8 +82,20 @@ returns table( "created" timestamp) external name sql.prepared_statements; create view sys.prepared_statements as select * from sys.prepared_statements(); -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements') and type = 5; -update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements'); +create function sys.prepared_statements_args() +returns table( +"statementid" int, +"parameter" boolean, +"type" string, +"digits" int, +"scale" int, +"schema" string, +"table" string, +"column" string) + external name sql.prepared_statements_args; +create view sys.prepared_statements_args as select * from sys.prepared_statements_args(); +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements', 'prepared_statements_args') and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('sessions', 'prepared_statements', 'prepared_statements_args'); update sys.functions set system = true where s
MonetDB: default - Approve upgrade.
Changeset: 08b786ab3cb7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08b786ab3cb7 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 1216 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -41,7 +41,7 @@ drop function sys.sessions; create function sys.sessions() returns table( "sessionid" int, -"user" string, +"username" string, "login" timestamp, "idle" timestamp, "optimizer" string, @@ -76,7 +76,7 @@ create procedure sys.stopsession("sessio create function sys.prepared_statements() returns table( "sessionid" int, -"user" string, +"username" string, "statementid" int, "statement" string, "created" timestamp) @@ -85,10 +85,11 @@ create view sys.prepared_statements as s create function sys.prepared_statements_args() returns table( "statementid" int, -"parameter" boolean, "type" string, -"digits" int, -"scale" int, +"type_digits" int, +"type_scale" int, +"inout" tinyint, +"number" int, "schema" string, "table" string, "column" string) @@ -107,17 +108,16 @@ drop view sys.queue; drop function sys.queue; create function sys.queue() returns table( - tag bigint, - sessionid int, - "user" string, - started timestamp, - status string, - query string, - progress int, - workers int, - memory int -) -external name sql.sysmon_queue; +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"progress" int, +"workers" int, +"memory" int) + external name sql.sysmon_queue; grant execute on function sys.queue to public; create view sys.queue as select * from sys.queue(); grant select on sys.queue to public; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 @@ -41,7 +41,7 @@ drop function sys.sessions; create function sys.sessions() returns table( "sessionid" int, -"user" string, +"username" string, "login" timestamp, "idle" timestamp, "optimizer" string, @@ -76,7 +76,7 @@ create procedure sys.stopsession("sessio create function sys.prepared_statements() returns table( "sessionid" int, -"user" string, +"username" string, "statementid" int, "statement" string, "created" timestamp) @@ -85,10 +85,11 @@ create view sys.prepared_statements as s create function sys.prepared_statements_args() returns table( "statementid" int, -"parameter" boolean, "type" string, -"digits" int, -"scale" int, +"type_digits" int, +"type_scale" int, +"inout" tinyint, +"number" int, "schema" string, "table" string, "column" string) @@ -107,17 +108,16 @@ drop view sys.queue; drop function sys.queue; create function sys.queue() returns table( - tag bigint, - sessionid int, - "user" string, - started timestamp, - status string, - query string, - progress int, - workers int, - memory int -) -external name sql.sysmon_queue; +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"progress" int, +"workers" int, +"memory" int) + external name sql.sysmon_queue; grant execute on function sys.queue to public; create view sys.queue as select * from sys.queue(); grant select on sys.queue to public; diff --git a/sql/
MonetDB: default - Approve upgrade.
Changeset: 6cfe97b5dd88 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cfe97b5dd88 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 183364 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -336,5542 +336,5550 @@ insert into sys.functions values (104, ' insert into sys.args values (34984, 104, 'res_0', 'any', 0, 0, 0, 0); insert into sys.args values (34985, 104, 'arg_1', 'any', 0, 0, 1, 1); insert into sys.args values (34986, 104, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (105, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34987, 105, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34988, 105, 'arg_1', 'tinyint', 8, 0, 1, 1); +insert into sys.functions values (105, 'star', '', '', 0, 1, false, false, false, 2000, true, true); +insert into sys.args values (34987, 105, 'res_0', 'any', 0, 0, 0, 0); insert into sys.functions values (106, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34989, 106, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34990, 106, 'arg_1', 'smallint', 16, 0, 1, 1); +insert into sys.args values (34988, 106, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34989, 106, 'arg_1', 'tinyint', 8, 0, 1, 1); insert into sys.functions values (107, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34991, 107, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34992, 107, 'arg_1', 'int', 32, 0, 1, 1); +insert into sys.args values (34990, 107, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34991, 107, 'arg_1', 'smallint', 16, 0, 1, 1); insert into sys.functions values (108, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34993, 108, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34994, 108, 'arg_1', 'hugeint', 128, 0, 1, 1); +insert into sys.args values (34992, 108, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34993, 108, 'arg_1', 'int', 32, 0, 1, 1); insert into sys.functions values (109, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34995, 109, 'res_0', 'bigint', 64, 0, 0, 0); -insert into sys.args values (34996, 109, 'arg_1', 'bigint', 64, 0, 1, 1); +insert into sys.args values (34994, 109, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34995, 109, 'arg_1', 'hugeint', 128, 0, 1, 1); insert into sys.functions values (110, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34997, 110, 'res_0', 'decimal', 38, 0, 0, 0); -insert into sys.args values (34998, 110, 'arg_1', 'decimal', 2, 0, 1, 1); +insert into sys.args values (34996, 110, 'res_0', 'bigint', 64, 0, 0, 0); +insert into sys.args values (34997, 110, 'arg_1', 'bigint', 64, 0, 1, 1); insert into sys.functions values (111, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34999, 111, 'res_0', 'decimal', 38, 0, 0, 0); -insert into sys.args values (35000, 111, 'arg_1', 'decimal', 4, 0, 1, 1); +insert into sys.args values (34998, 111, 'res_0', 'decimal', 38, 0, 0, 0); +insert into sys.args values (34999, 111, 'arg_1', 'decimal', 2, 0, 1, 1)
MonetDB: default - Approve upgrade.
Changeset: 692e1d90e121 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/692e1d90e121 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve upgrade. diffs (294 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -21,6 +21,38 @@ update sys.functions set system = true w set schema "sys"; create view sys.malfunctions as select * from sys.malfunctions(); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'malfunctions'; +drop view sys.dependencies_vw; +drop view sys.ids; +CREATE VIEW sys.ids (id, name, schema_id, table_id, table_name, obj_type, sys_table, system) AS +SELECT id, name, cast(null as int) as schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'author' AS obj_type, 'sys.auths' AS sys_table, (name in ('public','sysadmin','monetdb','.snapshot')) AS system FROM sys.auths UNION ALL +SELECT id, name, cast(null as int) as schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, ifthenelse(system, 'system schema', 'schema'), 'sys.schemas', system FROM sys.schemas UNION ALL +SELECT t.id, name, t.schema_id, t.id as table_id, t.name as table_name, cast(lower(tt.table_type_name) as varchar(40)), 'sys.tables', t.system FROM sys.tables t left outer join sys.table_types tt on t.type = tt.table_type_id UNION ALL +SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, ifthenelse(t.system, 'system column', 'column'), 'sys._columns', t.system FROM sys._columns c JOIN sys._tables t ON c.table_id = t.id UNION ALL +SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, 'column', 'tmp._columns', t.system FROM tmp._columns c JOIN tmp._tables t ON c.table_id = t.id UNION ALL +SELECT k.id, k.name, t.schema_id, k.table_id, t.name as table_name, ifthenelse(t.system, 'system key', 'key'), 'sys.keys', t.system FROM sys.keys k JOIN sys._tables t ON k.table_id = t.id UNION ALL +SELECT k.id, k.name, t.schema_id, k.table_id, t.name as table_name, 'key', 'tmp.keys', t.system FROM tmp.keys k JOIN tmp._tables t ON k.table_id = t.id UNION ALL +SELECT i.id, i.name, t.schema_id, i.table_id, t.name as table_name, ifthenelse(t.system, 'system index', 'index'), 'sys.idxs', t.system FROM sys.idxs i JOIN sys._tables t ON i.table_id = t.id UNION ALL +SELECT i.id, i.name, t.schema_id, i.table_id, t.name as table_name, 'index' , 'tmp.idxs', t.system FROM tmp.idxs i JOIN tmp._tables t ON i.table_id = t.id UNION ALL +SELECT g.id, g.name, t.schema_id, g.table_id, t.name as table_name, ifthenelse(t.system, 'system trigger', 'trigger'), 'sys.triggers', t.system FROM sys.triggers g JOIN sys._tables t ON g.table_id = t.id UNION ALL +SELECT g.id, g.name, t.schema_id, g.table_id, t.name as table_name, 'trigger', 'tmp.triggers', t.system FROM tmp.triggers g JOIN tmp._tables t ON g.table_id = t.id UNION ALL +SELECT f.id, f.name, f.schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) as varchar(40)), 'sys.functions', f.system FROM sys.functions f left outer join sys.function_types ft on f.type = ft.function_type_id UNION ALL +SELECT a.id, a.name, f.schema_id, a.func_id as table_id, f.name as table_name, cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) || ' arg' as varchar(44)), 'sys.args', f.system FROM sys.args a JOIN sys.functions f ON a.func_id = f.id left outer join sys.function_types ft on f.type = ft.function_type_id UNION ALL +SELECT id, name, schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'sequence', 'sys.sequences', false FROM sys.sequences UNION ALL +SELECT o.id, o.name, pt.schema_id, pt.id, pt.name, 'partition of merge table', 'sys.objects', false FROM sys.objects o JOIN sys._tables pt ON o.sub = pt.id JOIN sys._tables mt ON o.nr = mt.id WHERE mt.type = 3 UNION ALL +SELECT id, sqlname, schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'type', 'sys.types', (sqlname in ('inet','json','url','uuid')) FROM sys.types WHERE id > 2000 + ORDER BY id; +GRANT SELECT ON sys.ids TO PUBLIC; +CREATE VIEW sys.dependencies_vw AS
MonetDB: default - Approve upgrade.
Changeset: 2a60b88782f9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2a60b88782f9 Modified Files: sql/backends/monet5/sql_upgrades.c sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.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 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 5330 to 300 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 @@ -4624,36 +4624,36 @@ sql_update_default(Client c, mvc *sql) pos += snprintf(buf + pos, bufsize - pos, "CREATE VIEW sys.describe_partition_tables AS\n" - " SELECT \n" + " SELECT\n" " m_sch,\n" " m_tbl,\n" " p_sch,\n" " p_tbl,\n" - " CASE \n" + " CASE\n" " WHEN p_raw_type IS NULL THEN 'READ ONLY'\n" " WHEN (p_raw_type = 'VALUES' AND pvalues IS NULL) OR (p_raw_type = 'RANGE' AND minimum IS NULL AND maximum IS NULL AND with_nulls) THEN 'FOR NULLS'\n" - " ELSE p_raw_type \n" + " ELSE p_raw_type\n" " END AS tpe,\n" " pvalues,\n" " minimum,\n" " maximum,\n" - " with_nulls \n" + " with_nulls\n" " FROM\n" " (WITH\n" - " tp(\"type\", table_id) AS \n" + " tp(\"type\", table_id) AS\n" " (SELECT ifthenelse((table_partitions.\"type\" & 2) = 2, 'VALUES', 'RANGE'), table_p
MonetDB: default - Approve upgrade.
Changeset: d775d5c970f6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d775d5c970f6 Modified Files: clients/Tests/MAL-signatures.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.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 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 385 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -56,17 +56,17 @@ stdout of test 'MAL-signatures` in direc # MonetDB/Python2 module loaded # MonetDB/R module loaded -Ready. - -# 14:39:22 > -# 14:39:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23085" "--port=30158" -# 14:39:22 > +# 16:19:19 > +# 16:19:19 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28001" "--port=38663" +# 16:19:19 > #select * from sys.malfunctions() order by module, "function", address, signature, comment; % .L1, .L1,.L1,.L1,.L1 # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 11, 28, 364,44, 874 # length +% 11, 28, 364,38, 874 # length +[ "aggr", "allnotequal", "command aggr.allnotequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLallnotequal;", "if all values in r are not equal to l return true, else if r has nil nil else false" ] +[ "aggr", "anyequal", "command aggr.anyequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLanyequal;", "if any value in r is equal to l return true, else if r has nil nil else false" ] [ "aggr", "avg", "command aggr.avg(b:bat[:bte], g:bat[:oid], e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on bte" ] [ "aggr", "avg", "command aggr.avg(b:bat[:dbl], g:bat[:oid], e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on dbl" ] [ "aggr", "avg", "command aggr.avg(b:bat[:flt], g:bat[:oid], e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on flt" ] @@ -6117,22 +6117,14 @@ Ready. [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], s:bat[:oid], scale:int):dbl ","CMDcalcavg;", "average of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:sht], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] -[ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:any_1):bat[:bit] ","CMDbatBETWEEN;", "B between LO and HI inclusive" ] -[ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:any_1, s:bat[:oid]):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive with candidates list"] -[ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:bat[:any_1]):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive" ] -[ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:any_1, hi:bat[:any_1], s:bat[:oid]):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive with candidates list"] -[ "batcalc", "between", "pattern batcalc.between(b:bat[:any_1], lo:bat[:any_1], hi:any_1):bat[:bit] ", "CMDbatBETWEEN;", "B between LO and HI inclusive" ] -[ "batcalc", "between", "pattern batcalc.between
MonetDB: default - Approve upgrade.
Changeset: 6319163e3d93 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6319163e3d93 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 304 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -5994,7 +5994,11 @@ create function sys.debug(flag string) r create function sys.debugflags() returns table(flag string, val bool) external name mdb."getDebugFlags"; -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags'); +create procedure sys."sleep"(msecs int) + external name "alarm"."sleep"; +create function sys."sleep"(msecs int) returns integer + external name "alarm"."sleep"; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep'); drop view sys.queue; drop function sys.queue; create function sys.queue() diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 @@ -5994,7 +5994,11 @@ create function sys.debug(flag string) r create function sys.debugflags() returns table(flag string, val bool) external name mdb."getDebugFlags"; -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags'); +create procedure sys."sleep"(msecs int) + external name "alarm"."sleep"; +create function sys."sleep"(msecs int) returns integer + external name "alarm"."sleep"; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep'); drop view sys.queue; drop function sys.queue; create function sys.queue() diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -5207,7 +5207,11 @@ create function sys.debug(flag string) r create function sys.debugflags() returns table(flag string, val bool) external name mdb."getDebugFlags"; -update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags'); +create procedure sys."sleep"(msecs int) + external name "alarm"."sleep"; +create function sys."sleep"(msecs int) returns integer + external name "alarm"."sleep"; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('debug', 'debugflags', 'sleep'); drop view sys.queue; drop function sys.queue; create function sys.queue() diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -5207,7 +5207,11 @@ create function sys.debug(flag string) r create function sys.debugflags() returns table(flag string, val bool) external name mdb."getDebugFlags"; -update s
MonetDB: default - Approve upgrade.
Changeset: 8e3f9b40b207 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e3f9b40b207 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 188602 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -179,5737 +179,5727 @@ insert into sys.functions values (62, 'r insert into sys.args values (29851, 62, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (29852, 62, 'arg_1', 'mbr', 0, 0, 1, 1); insert into sys.args values (29853, 62, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (63, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (63, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29854, 63, 'res', 'tinyint', 8, 0, 0, 0); insert into sys.args values (29855, 63, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (64, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (64, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29856, 64, 'res', 'smallint', 16, 0, 0, 0); insert into sys.args values (29857, 64, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (65, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (65, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29858, 65, 'res', 'int', 32, 0, 0, 0); insert into sys.args values (29859, 65, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (66, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (66, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29860, 66, 'res', 'bigint', 64, 0, 0, 0); insert into sys.args values (29861, 66, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (67, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (67, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29862, 67, 'res', 'hugeint', 128, 0, 0, 0); insert into sys.args values (29863, 67, 'arg', 'any', 0, 0, 1, 1); insert into sys.functions values (68, 'not_unique', 'not_unique', 'sql', 0, 3, false, false, false, 2000, true); insert into sys.args values (29864, 68, 'res', 'boolean', 1, 0, 0, 0); insert into sys.args values (29865, 68, 'arg', 'oid', 63, 0, 1, 1); -insert into sys.functions values (69, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29866, 69, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (29867, 69, 'arg_1', 'bigint', 64, 0, 1, 1); -insert into sys.functions values (70, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29868, 70, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (29869, 70, 'arg_1', 'oid', 63, 0, 1, 1); -insert into sys.functions values (71, 'hash', 'hash', 'mkey', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29870, 71, 'res_0', 'bigint', 64, 0, 0, 0); -insert into sys.args values (29871, 71, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (72, 'rotate_xor_hash', 'rotate_xor_hash', 'calc', 0, 1, false, false, false, 2000,
MonetDB: default - Approve upgrade.
Changeset: e07f21762cde for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e07f21762cde Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/sql_dump/Tests/dump.test sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (221 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -4206,6 +4206,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4206,6 +4206,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -3611,6 +3611,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -3611,6 +3611,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -4280,6 +4280,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc
MonetDB: default - Approve upgrade.
Changeset: 66794e0b06dc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66794e0b06dc Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve upgrade. diffs (truncated from 31200 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -2,3613 +2,3627 @@ Running database upgrade commands: set schema "sys"; delete from sys.dependencies where id < 2000; delete from sys.types where id < 2000; -insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000); -insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000); -insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000); -insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000); -insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000); -insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000); -insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000); -insert into sys.types values (7, 'oid', 'oid', 31, 0, 2, 6, 2000); -insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000); -insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000); -insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000); -insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000); -insert into sys.types values (12, 'bte', 'decimal', 2, 1, 10, 10, 2000); -insert into sys.types values (13, 'sht', 'decimal', 4, 1, 10, 10, 2000); -insert into sys.types values (14, 'int', 'decimal', 9, 1, 10, 10, 2000); -insert into sys.types values (15, 'lng', 'decimal', 18, 1, 10, 10, 2000); -insert into sys.types values (16, 'flt', 'real', 24, 2, 2, 11, 2000); -insert into sys.types values (17, 'dbl', 'double', 53, 2, 2, 11, 2000); -insert into sys.types values (18, 'int', 'month_interval', 3, 0, 10, 8, 2000); -insert into sys.types values (19, 'lng', 'day_interval', 4, 0, 10, 9, 2000); -insert into sys.types values (20, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); -insert into sys.types values (21, 'daytime', 'time', 7, 0, 0, 12, 2000); -insert into sys.types values (22, 'daytime', 'timetz', 7, 1, 0, 13, 2000); -insert into sys.types values (23, 'date', 'date', 0, 0, 0, 14, 2000); -insert into sys.types values (24, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); -insert into sys.types values (25, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); -insert into sys.types values (26, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 17, 2000); -insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); -insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 18, 2000); +insert into sys.types values (1, 'void', 'any', 0, 0, 0, 0, 2000); +insert into sys.types values (2, 'bat', 'table', 0, 0, 0, 1, 2000); +insert into sys.types values (3, 'ptr', 'ptr', 0, 0, 0, 1, 2000); +insert into sys.types values (4, 'bit', 'boolean', 1, 0, 2, 2, 2000); +insert into sys.types values (5, 'str', 'clob', 0, 0, 0, 4, 2000); +insert into sys.types values (6, 'str', 'varchar', 0, 0, 0, 4, 2000); +insert into sys.types values (7, 'str', 'char', 0, 0, 0, 3, 2000); +insert into sys.types values (8, 'oid', 'oid', 31, 0, 2, 6, 2000); +insert into sys.types values (9, 'bte', 'tinyint', 8, 1, 2, 7, 2000); +insert into sys.types values (10, 'sht', 'smallint', 16, 1, 2, 7, 2000); +insert into sys.types values (11, 'int', 'int', 32, 1, 2, 7, 2000); +insert into sys.types values (12, 'lng', 'bigint', 64, 1, 2, 7, 2000); +insert into sys.types values (13, 'bte', 'decimal', 2, 1, 10, 10, 2000); +insert into sys.types values (14, 'sht', 'decimal', 4, 1, 10, 10, 2000); +insert into sys.types values (15, 'int', 'decimal', 9, 1, 10, 10, 2000); +insert into sys.types values (16, 'lng', 'decimal', 18, 1, 10, 10, 2000); +insert into sys.types values (17, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (18, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (19, 'int', 'month_interval', 3, 0, 10, 8, 2000); +insert into sys.types values (20, 'lng', 'day_interval', 4, 0, 10, 9, 2000); +insert into sys.types values (21, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (22, 'daytime', 'time', 7, 0, 0, 12, 2000); +insert into sys.types values (23, 'daytime', 'timetz', 7, 1, 0, 13, 2000); +insert into sys.types values (24, 'date', 'date', 0, 0, 0, 14, 2000); +insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); +insert into sys.ty
MonetDB: default - Approve upgrade.
Changeset: 7b4c6037b13f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b4c6037b13f Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.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 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade. diffs (truncated from 656 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
MonetDB: default - Approve upgrade output.
Changeset: d1cc3972958a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1cc3972958a Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade output. diffs (truncated from 6740 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -4357,895 +4357,904 @@ insert into sys.args values (14604, 1174 insert into sys.functions values (1175, 'year', 'year', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14605, 1175, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14606, 1175, 'arg_1', 'date', 0, 0, 1, 1); -insert into sys.functions values (1176, 'month', 'month', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.functions values (1176, 'quarter', 'quarter', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14607, 1176, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14608, 1176, 'arg_1', 'date', 0, 0, 1, 1); -insert into sys.functions values (1177, 'day', 'day', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.functions values (1177, 'month', 'month', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14609, 1177, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14610, 1177, 'arg_1', 'date', 0, 0, 1, 1); -insert into sys.functions values (1178, 'hour', 'hours', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.functions values (1178, 'day', 'day', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14611, 1178, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (14612, 1178, 'arg_1', 'time', 7, 0, 1, 1); -insert into sys.functions values (1179, 'minute', 'minutes', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.args values (14612, 1178, 'arg_1', 'date', 0, 0, 1, 1); +insert into sys.functions values (1179, 'hour', 'hours', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14613, 1179, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14614, 1179, 'arg_1', 'time', 7, 0, 1, 1); -insert into sys.functions values (1180, 'second', 'sql_seconds', 'mtime', 0, 1, false, false, false, 2000); -insert into sys.args values (14615, 1180, 'res_0', 'decimal', 9, 3, 0, 0); +insert into sys.functions values (1180, 'minute', 'minutes', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.args values (14615, 1180, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14616, 1180, 'arg_1', 'time', 7, 0, 1, 1); -insert into sys.functions values (1181, 'hour', 'hours', 'mtime', 0, 1, false, false, false, 2000); -insert into sys.args values (14617, 1181, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (14618, 1181, 'arg_1', 'timetz', 7, 0, 1, 1); -insert into sys.functions values (1182, 'minute', 'minutes', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.functions values (1181, 'second', 'sql_seconds', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.args values (14617, 1181, 'res_0', 'decimal', 9, 3, 0, 0); +insert into sys.args values (14618, 1181, 'arg_1', 'time', 7, 0, 1, 1); +insert into sys.functions values (1182, 'hour', 'hours', 'mtime', 0, 1, false, false, false, 2000); insert into sys.args values (14619, 1182, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14620, 1182, 'arg_1', 'timetz', 7, 0, 1, 1); -insert into sys.functions values (1183, 'second', 'sql_seconds', 'mtime', 0, 1, false, false, false, 2000); -insert into sys.args values (14621, 1183, 'res_0', 'decimal', 9, 3, 0, 0); +insert into sys.functions values (1183, 'minute', 'minutes', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.args values (14621, 1183, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (14622, 1183, 'arg_1', 'timetz', 7, 0, 1, 1); -insert into sys.functions values (1184, 'year', 'year', 'mtime', 0, 1, false, false, false, 2000); -insert into sys.args values (14623, 1184, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (14624, 1184, 'arg_1', 'timestamp', 7, 0, 1, 1); -insert into sys.functions values (1185, 'month', 'month', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.functions values (1184, 'second', 'sql_seconds', 'mtime', 0, 1, false, false, false, 2000); +insert into sys.args values (14623, 1184, 'res_0', 'decimal', 9, 3, 0, 0); +insert into sys.args values (14624, 1184, 'arg_1', 'timetz', 7, 0, 1, 1); +insert into sys.functions values (1185, 'year', 'year', 'mtime', 0, 1, fal
MonetDB: default - Approve upgrade output.
Changeset: eea47ad7f7d3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/eea47ad7f7d3 Modified Files: sql/test/emptydb/Tests/check.stable.out Branch: default Log Message: Approve upgrade output. diffs (11 lines): 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 @@ -4242,6 +4242,7 @@ select 'null in fkeys.delete_action', de [ "grant on function", "sys", "covar_samp", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "covar_samp", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "current_sessionid","public", "EXECUTE", "monetdb", 0 ] +[ "grant on function", "sys", "database", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_to_str", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_trunc", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_trunc", "public", "EXECUTE", "monetdb", 0 ] ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve upgrade output.
Changeset: 546e048a5ca0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/546e048a5ca0 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade output. diffs (truncated from 2800 to 300 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -530,7 +530,6 @@ CREATE VIEW INFORMATION_SCHEMA.SCHEMATA cast(NULL AS varchar(1)) AS DEFAULT_CHARACTER_SET_SCHEMA, cast('UTF-8' AS varchar(16)) AS DEFAULT_CHARACTER_SET_NAME, cast(NULL AS varchar(1)) AS SQL_PATH, - -- MonetDB column extensions s."id" AS schema_id, s."system" AS is_system, cm."remark" AS comments @@ -552,7 +551,6 @@ CREATE VIEW INFORMATION_SCHEMA.TABLES AS cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0, 2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO, cast('NO' AS varchar(3)) AS IS_TYPED, cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE' WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION, - -- MonetDB column extensions t."schema_id" AS schema_id, t."id" AS table_id, t."type" AS table_type_id, @@ -579,7 +577,6 @@ CREATE VIEW INFORMATION_SCHEMA.VIEWS AS cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE, cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE, cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO, - -- MonetDB column extensions t."schema_id" AS schema_id, t."id" AS table_id, cast(sys.ifthenelse(t."system", t."type" + 10 , t."type") AS smallint) AS table_type_id, @@ -605,7 +602,7 @@ CREATE VIEW INFORMATION_SCHEMA.COLUMNS A cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_digits", NULL) AS int) AS NUMERIC_PRECISION, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'), 2, sys.ifthenelse(c."type" IN ('decimal','numeric'), 10, NULL)) AS int) AS NUMERIC_PRECISION_RADIX, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_scale", NULL) AS int) AS NUMERIC_SCALE, - cast(sys.ifthenelse(c."type" IN ('date','timestamp','timestamptz','time','timetz'), c."type_scale" -1, NULL) AS int) AS DATETIME_PRECISION, + cast(sys.ifthenelse(c."type" IN ('date','timestamp','timestamptz','time','timetz'), sys.ifthenelse(c."type_scale" > 0, c."type_scale" -1, 0), NULL) AS int) AS DATETIME_PRECISION, cast(CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN (CASE c."type_digits" WHEN 1 THEN 'interval year' WHEN 2 THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL END) WHEN 'sec_interval' THEN (CASE c."type_digits" WHEN 5 THEN 'interval day to hour' WHEN 6 THEN 'interval day to minute' WHEN 7 THEN 'interval day to second' WHEN 8 THEN 'interval hour' WHEN 9 THEN 'interval hour to minute' WHEN 10
MonetDB: default - Approve upgrade tests.
Changeset: dddfbd662d0e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dddfbd662d0e Removed Files: sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.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 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade tests. diffs (truncated from 194046 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -220,5636 +220,5664 @@ insert into sys.functions values (74, '< insert into sys.args values (20793, 74, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (20794, 74, 'arg_1', 'any', 0, 0, 1, 1); insert into sys.args values (20795, 74, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (79, 'sql_exists', 'exist', 'aggr', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20796, 79, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20797, 79, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (80, 'sql_not_exists', 'not_exist', 'aggr', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20798, 80, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20799, 80, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (81, 'in', 'in', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20800, 81, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20801, 81, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.args values (20802, 81, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (82, 'identity', 'identity', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20803, 82, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (20804, 82, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (83, 'rowid', 'identity', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20805, 83, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (20806, 83, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (84, 'rowid', 'rowid', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20807, 84, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (20808, 84, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.args values (20809, 84, 'arg_2', 'varchar', 0, 0, 1, 2); -insert into sys.args values (20810, 84, 'arg_3', 'varchar', 0, 0, 1, 3); -insert into sys.functions values (87, 'sql_min', 'min', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20811, 87, 'res_0', 'any', 0, 0, 0, 0); -insert into sys.args values (20812, 87, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.args values (20813, 87, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (88, 'sql_max', 'max', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20814, 88, 'res_0', 'any', 0, 0, 0, 0); -insert into sys.args values (20815, 88, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.args values (20816, 88, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (89, 'least', 'min_no_nil', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20817, 89, 'res_0', 'any', 0, 0, 0, 0); -insert into sys.args values (20818, 89, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.args values (2081
MonetDB: default - Approve upgrade tests.
Changeset: f1f72e0ef479 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1f72e0ef479 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade tests. diffs (209 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str create function sys.deltas ("schema" string, "table" string, "column" string) returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint, "deletes" bigint, "level" int) external name "sql"."deltas"; update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('deltas') and type = 5; set schema "sys"; +commit; # MonetDB/SQL module loaded diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 @@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str create function sys.deltas ("schema" string, "table" string, "column" string) returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint, "deletes" bigint, "level" int) external name "sql"."deltas"; update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('deltas') and type = 5; set schema "sys"; +commit; # MonetDB/SQL module loaded diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str create function sys.deltas ("schema" string, "table" string, "column" string) returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint, "deletes" bigint, "level" int) external name "sql"."deltas"; update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('deltas') and type = 5; set schema "sys"; +commit; # MonetDB/SQL module loaded diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str create function sys.deltas ("schema" string, "table" string, "column" string) returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted" bigint, "updates" bigint, "deletes" bigint, "level" int) external name "sql"."deltas"; update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name in ('deltas') and type = 5; set schema "sys"; +commit; # MonetDB/SQL module loaded diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -
MonetDB: default - Approve upgrade for describe_accessible_tables.
Changeset: a151cf4b45d9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a151cf4b45d9 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade for describe_accessible_tables. diffs (truncated from 750 to 300 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -416,3 +416,26 @@ GRANT EXECUTE ON AGGREGATE ST_MakeLine(G update sys.functions set system = true where system <> true and schema_id = 2000 and name in ('st_collect', 'st_distancegeographic', 'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2', 'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex', 'st_makeline'); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'geometry_columns'; +Running database upgrade commands: +create view sys.describe_accessible_tables as + select + schemas.name as schema, + tables.name as table, + table_types.table_type_name as table_type, + privilege_codes.privilege_code_name as privs, + privileges.privileges as privs_code + from privileges + join sys.roles + on privileges.auth_id = roles.id + join sys.tables + on privileges.obj_id = tables.id + join sys.table_types + on tables.type = table_types.table_type_id + join sys.schemas + on tables.schema_id = schemas.id + join sys.privilege_codes + on privileges.privileges = privilege_codes.privilege_code_id + where roles.name = current_role; +GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC; +update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'describe_accessible_tables'; + diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out @@ -416,3 +416,26 @@ GRANT EXECUTE ON AGGREGATE ST_MakeLine(G update sys.functions set system = true where system <> true and schema_id = 2000 and name in ('st_collect', 'st_distancegeographic', 'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2', 'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex', 'st_makeline'); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'geometry_columns'; +Running database upgrade commands: +create view sys.describe_accessible_tables as + select + schemas.name as schema, + tables.name as table, + table_types.table_type_name as table_type, + privilege_codes.privilege_code_name as privs, + privileges.privileges as privs_code + from privileges + join sys.roles + on privileges.auth_id = roles.id + join sys.tables + on privileges.obj_id = tables.id + join sys.table_types + on tables.type = table_types.table_type_id + join sys.schemas + on tables.schema_id = schemas.id + join sys.privilege_codes + on privileges.privileges = privilege_code
MonetDB: default - Approve upgrade: drop systemfunctions.
Changeset: c4840f4eae31 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c4840f4eae31 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade: drop systemfunctions. diffs (254 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; diff --git a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 @@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 @@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN s
MonetDB: default - Approve upgrade on powerpc.
Changeset: 653e941c60e8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=653e941c60e8 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 Branch: default Log Message: Approve upgrade on powerpc. diffs (truncated from 9265 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 @@ -828,5009 +828,4994 @@ insert into sys.args values (19195, 233, insert into sys.args values (19196, 233, 'arg_1', 'sec_interval', 13, 0, 1, 1); insert into sys.functions values (234, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19197, 234, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19198, 234, 'arg_1', 'tinyint', 8, 0, 1, 1); +insert into sys.args values (19198, 234, 'arg_1', 'double', 53, 0, 1, 1); insert into sys.functions values (235, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19199, 235, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19200, 235, 'arg_1', 'smallint', 16, 0, 1, 1); +insert into sys.args values (19200, 235, 'arg_1', 'tinyint', 8, 0, 1, 1); insert into sys.functions values (236, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19201, 236, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19202, 236, 'arg_1', 'int', 32, 0, 1, 1); +insert into sys.args values (19202, 236, 'arg_1', 'smallint', 16, 0, 1, 1); insert into sys.functions values (237, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19203, 237, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19204, 237, 'arg_1', 'bigint', 64, 0, 1, 1); +insert into sys.args values (19204, 237, 'arg_1', 'int', 32, 0, 1, 1); insert into sys.functions values (238, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19205, 238, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19206, 238, 'arg_1', 'hugeint', 128, 0, 1, 1); +insert into sys.args values (19206, 238, 'arg_1', 'bigint', 64, 0, 1, 1); insert into sys.functions values (239, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19207, 239, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19208, 239, 'arg_1', 'decimal', 2, 0, 1, 1); +insert into sys.args values (19208, 239, 'arg_1', 'hugeint', 128, 0, 1, 1); insert into sys.functions values (240, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19209, 240, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19210, 240, 'arg_1', 'decimal', 4, 0, 1, 1); -insert into sys.functions values (241, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19211, 241, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19212, 241, 'arg_1', 'decimal', 9, 0, 1, 1); -insert into sys.functions values (242, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19213, 242, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19214, 242, 'arg_1', 'decimal', 18, 0, 1, 1); -insert into sys.functions values (243, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19215, 243, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19216, 243, 'arg_1', 'decimal', 38, 0, 1, 1); -insert into sys.functions values (244, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19217, 244, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19218, 244, 'arg_1', 'real', 24, 0, 1, 1); -insert into sys.functions values (245, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19219, 245, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19220, 245, 'arg_1', 'double', 53, 0, 1, 1); -insert into sys.functions values (246, 'and', 'and', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (19221, 246, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (19222, 246, 'arg_1', 'boolean', 1, 0, 1, 1); -insert into sys.args values (19223, 246, 'arg_2', 'boolean', 1, 0, 1, 2); -insert into sys.functions values (247, 'or', 'or', 'calc', 0, 1, false, false, false, 2000, true); -insert into sys.args values (19224, 247, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (19225, 247, 'arg_1', 'boolean', 1, 0, 1, 1); -insert into sys.args values (19226, 247, 'arg_2', 'boolean', 1, 0, 1, 2); -insert into sys.functions values (248, 'xor', 'xor', 'calc', 0, 1, false, false, false, 20
MonetDB: default - Approve upgrade on powerpc.
Changeset: 8db7bfce6045 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8db7bfce6045 Added Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 Branch: default Log Message: Approve upgrade on powerpc. diffs (truncated from 5347 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 new file mode 100644 --- /dev/null +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 @@ -0,0 +1,5342 @@ +stdout of test 'upgrade` in directory 'sql/test/emptydb-upgrade-chain` itself: + + +# 16:53:35 > +# 16:53:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39660" "--set" "mapi_usock=/var/tmp/mtest-30908/.s.monetdb.39660" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:53:35 > + +# MonetDB 5 server v11.21.16 (hg id: c20b591c1c70+) +# This is an unreleased version +# Serving database 'mTests_sql_test_emptydb-upgrade-chain', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 +# MonetDB/GIS module loaded +Running database upgrade commands: +set schema sys; +ALTER TABLE sys.keywords SET READ WRITE; +INSERT INTO sys.keywords VALUES ('WINDOW'); +drop table sys.systemfunctions; +create view sys.systemfunctions as select id as function_id from sys.functions where system; +grant select on sys.systemfunctions to public; +update sys._tables set system = true where name = 'systemfunctions' and schema_id = (select id from sys.schemas where name = 'sys'); +update sys._columns set type_digits = 1048576 where name = 'query' and table_id in (select id from sys._tables t where t.name = '_tables' and t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp'))); +update sys._columns set type_digits = 1048576 where name = 'query' and table_id in (select id from sys._tables t where t.name = 'tables' and t.schema_id in (select id from sys.schemas s where s.name = 'sys')); +set schema "sys"; +commit; + +Running database upgrade commands: +set schema "sys"; +ALTER TABLE sys.keywords SET READ ONLY; +set schema "sys"; +commit; + +Running database upgrade commands: +set schema "sys"; +delete from sys.dependencies where id < 2000; +delete from sys.types where id < 2000; +insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000); +insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000); +insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000); +insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000); +insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000); +insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000); +insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000); +insert into sys.types values (7, 'oid', 'oid', 63, 0, 2, 6, 2000); +insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000); +insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000); +insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000); +insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000); +insert into sys.types values (12, 'bte', 'decimal', 2, 1, 10, 10, 2000); +insert into sys.types values (13, 'sht', 'decimal', 4, 1, 10, 10, 2000); +insert into sys.types values (14, 'int', 'decimal', 9, 1, 10, 10, 2000); +insert into sys.types values (15, 'lng', 'decimal', 18, 1, 10, 10, 2000); +insert into sys.types values (16, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (17, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (18, 'int', 'month_interval', 32, 0, 2, 8, 2000); +insert into sys.types values (19, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (20, 'daytime', 'time', 7, 0, 0, 12, 2000); +insert into sys.types values (21, 'daytime', 'timetz', 7, 1, 0, 12, 2000); +insert into sys.types values (22, 'date', 'date', 0, 0, 0, 13, 2000); +insert into sys.types values (23, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000); +insert into sys.types values (24, 'timestamp', 'timestamptz', 7, 1, 0, 14, 2000); +insert into sys.types values (25, 'sqlblob', 'blob', 0, 0, 0, 5, 2000); +insert into sys.types values (26, 'wkb', 'geometry', 0, 0, 0, 15, 2000); +insert into sys.types values (27, 'wkba', 'geometrya', 0, 0, 0, 16, 2000); +insert into sys
MonetDB: default - Approve upgrade from new database.
Changeset: f1f9b243fe37 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1f9b243fe37 Modified Files: sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out Branch: default Log Message: Approve upgrade from new database. diffs (110 lines): diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 --- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 +++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 @@ -32,15 +32,22 @@ Ready. START TRANSACTION; CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; +COMMENT ON SCHEMA "testschema" IS 'a schema used for testing'; ALTER USER "testuser" SET SCHEMA "testschema"; CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER; +COMMENT ON SEQUENCE "testschema"."selfref_seq" IS 'sequence number for selfref table'; CREATE SEQUENCE "testschema"."test_seq" AS INTEGER; +COMMENT ON SEQUENCE "testschema"."test_seq" IS 'sequence number for testing'; SET SCHEMA "testschema"; CREATE TABLE "testschema"."smallstring" ( "string1" VARCHAR(5), "string2" CHAR(5), "string3" CHARACTER LARGE OBJECT ); +COMMENT ON TABLE "testschema"."smallstring" IS 'table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string1" IS 'first column of table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string2" IS 'second column of table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string3" IS 'third column of table to test small strings'; COPY 66 RECORDS INTO "testschema"."smallstring" FROM stdin USING DELIMITERS '\t','\n','"'; "a0" "b0""c0" "a1" "b1""c1" @@ -101126,6 +101133,12 @@ CREATE TABLE "testschema"."test" ( "id" INTEGER, "i" SMALLINT DEFAULT next value for "testschema"."test_seq" ); +CREATE INDEX "i1" ON "testschema"."test" ("id", "i"); +CREATE ORDERED INDEX "i2" ON "testschema"."test" ("id"); +CREATE IMPRINTS INDEX "i3" ON "testschema"."test" ("id"); +COMMENT ON INDEX "testschema"."i1" IS 'a unique index used for testing'; +COMMENT ON INDEX "testschema"."i2" IS 'an ordered index used for testing'; +COMMENT ON INDEX "testschema"."i3" IS 'an imprints index used for testing'; COPY 5 RECORDS INTO "testschema"."test" FROM stdin USING DELIMITERS '\t','\n','"'; 0 7 1 10 @@ -101287,6 +101300,7 @@ ALTER TABLE "testschema"."mt2" ADD TABLE ALTER TABLE "testschema"."mt1" ADD TABLE "t1"; ALTER TABLE "testschema"."mt1" ADD TABLE "t2"; create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1, keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2; +COMMENT ON VIEW "testschema"."keytest3" IS 'a view used for testing'; create trigger keytesttrigger after update on keytest1 referencing new row as new_row for each row insert into keytest2 values (new_row.key1, new_row.key2); create function keyjoin() returns table ( @@ -101301,6 +101315,7 @@ begin where keytest1.key1 = keytest2.key1 and keytest1.key2 = keytest2.key2 ); end; +COMMENT ON FUNCTION "testschema"."keyjoin"() IS 'function used for testing'; create function nleaves() returns integer begin diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out b/sql/test/testdb-upgrade/Tests/dump.stable.out --- a/sql/test/testdb-upgrade/Tests/dump.stable.out +++ b/sql/test/testdb-upgrade/Tests/dump.stable.out @@ -27,15 +27,22 @@ Ready. START TRANSACTION; CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; +COMMENT ON SCHEMA "testschema" IS 'a schema used for testing'; ALTER USER "testuser" SET SCHEMA "testschema"; CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER; +COMMENT ON SEQUENCE "testschema"."selfref_seq" IS 'sequence number for selfref table'; CREATE SEQUENCE "testschema"."test_seq" AS INTEGER; +COMMENT ON SEQUENCE "testschema"."test_seq" IS 'sequence number for testing'; SET SCHEMA "testschema"; CREATE TABLE "testschema"."smallstring" ( "string1" VARCHAR(5), "string2" CHAR(5), "string3" CHARACTER LARGE OBJECT ); +COMMENT ON TABLE "testschema"."smallstring" IS 'table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string1" IS 'first column of table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string2" IS 'second column of table to test small strings'; +COMMENT ON COLUMN "testschema"."smallstring"."string3" IS 'third column of table to test small strings'; COPY 66 RECORDS INTO "testsch
MonetDB: default - Approve upgrade after changeset 414c573b979c.
Changeset: 7a5efe47dd6a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a5efe47dd6a Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade after changeset 414c573b979c. diffs (truncated from 742 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.31' -# Finished reading the write-ahead log 'sql_logs/sql/log.31' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -Ready. Running database upgrade commands: set schema "sys"; drop function sys.dependencies_functions_os_triggers(); @@ -96,6 +88,9 @@ insert into sys.systemfunctions (select set schema "sys"; commit; +# MonetDB/SQL module loaded + +Ready. # 15:17:55 > # 15:17:55 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6495" "--port=30245" diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.31' -# Finished reading the write-ahead log 'sql_logs/sql/log.31' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -Ready. Running database upgrade commands: set schema "sys"; drop function sys.dependencies_functions_os_triggers(); @@ -96,6 +88,9 @@ insert into sys.systemfunctions (select set schema "sys"; commit; +# MonetDB/SQL module loaded + +Ready. # 15:55:37 > # 15:55:37 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12365" "--port=35877" diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -16,14 +16,6 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.31' -# Finished reading the write-ahead log 'sql_logs/sql/log.31' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -Ready. Running database upgrade commands: set schema "sys"; drop function sys.dependencies_functions_os_triggers(); @@ -96,6 +88,9 @@ insert into sys.systemfunctions (select set schema "sys"; commit; +# MonetDB/SQL module loaded + +Ready. # 16:02:52 > # 16:02:52 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-5391" "--port=32
MonetDB: default - Approve upgrade (missed part of merge).
Changeset: 6af351f2b2f2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6af351f2b2f2 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message: Approve upgrade (missed part of merge). diffs (172 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 15:55:37 > diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 21:10:45 > diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -15,6 +15,39 @@ stdout of test 'upgrade` in directory 's # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36250/ # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = tru
MonetDB: default - Approve upgrade code on no-hge build.
Changeset: cb7e09b86c8b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cb7e09b86c8b Modified Files: sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message: Approve upgrade code on no-hge build. diffs (250 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out @@ -376,10 +376,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, username varchar(1024), password varchar(256)); +create function sys.decypher (cypher string) returns string external name sql.decypher; +update sys.functions set system = true where system <> true and name = 'decypher' and schema_id = 2000 and type = 1; +update sys._tables set system = true where system <> true and name = 'remote_user_info' and schema_id = 2000; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN - RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); + RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id; END; CREATE VIEW sys.describe_tables AS SELECT diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out --- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out +++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out @@ -370,10 +370,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, username varchar(1024), password varchar(256)); +create function sys.decypher (cypher string) returns string external name sql.decypher; +update sys.functions set system = true where system <> true and name = 'decypher' and schema_id = 2000 and type = 1; +update sys._tables set system = true where system <> true and name = 'remote_user_info' and schema_id = 2000; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN - RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); + RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id; END; CREATE VIEW sys.describe_tables AS SELECT diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out @@ -46,10 +46,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, usern
MonetDB: default - Approve upgrade outputs for new system table ...
Changeset: 43b1645251ff for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/43b1645251ff Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve upgrade outputs for new system table sys.fkey_actions and view sys.fkeys diffs (truncated from 1102 to 300 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -5756,4 +5756,25 @@ create procedure sys.vacuum(sname string create procedure sys.stop_vacuum(sname string, tname string, cname string) external name sql.stop_vacuum; update sys.functions set system = true where system <> true and name in ('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2; +CREATE TABLE sys.fkey_actions ( +action_id SMALLINT NOT NULL PRIMARY KEY, +action_name VARCHAR(15) NOT NULL); +INSERT INTO sys.fkey_actions (action_id, action_name) VALUES + (0, 'NO ACTION'), + (1, 'CASCADE'), + (2, 'RESTRICT'), + (3, 'SET NULL'), + (4, 'SET DEFAULT'); +ALTER TABLE sys.fkey_actions SET READ ONLY; +GRANT SELECT ON sys.fkey_actions TO PUBLIC; +CREATE VIEW sys.fkeys AS +SELECT id, table_id, type, name, rkey, update_action_id, upd.action_name as update_action, delete_action_id, del.action_name as delete_action FROM ( + SELECT id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) AS delete_action_id FROM sys.keys WHERE type = 2 + UNION ALL + SELECT id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) AS delete_action_id FROM tmp.keys WHERE type = 2 +) AS fks +JOIN sys.fkey_actions upd ON fks.update_action_id = upd.action_id +JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; +GRANT SELECT ON sys.fkeys TO PUBLIC; +update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128