Changeset: 33d9b1314f80 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=33d9b1314f80 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: Jul2017 Log Message:
Approve upgrade from new latest release. diffs (truncated from 39194 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 @@ -25,65 +25,9 @@ stdout of test 'upgrade` in directory 's Ready. -Running database upgrade commands: -set schema "sys"; -delete from sys._columns where table_id = (select id from sys._tables where name = 'connections' and schema_id = (select id from sys.schemas where name = 'sys')); -delete from sys._tables where name = 'connections' and schema_id = (select id from sys.schemas where name = 'sys'); -update sys.functions set side_effect = false where name in ('like', 'ilike') and schema_id = (select id from sys.schemas where name = 'sys'); -drop function sys.malfunctions; -create function sys.malfunctions() returns table("module" string, "function" string, "signature" string, "address" string, "comment" string) external name "manual"."functions"; -drop function sys.optimizer_stats(); -create function sys.optimizer_stats() returns table (optname string, count int, timing bigint) external name inspect.optimizer_stats; -insert into sys.systemfunctions (select id from sys.functions where name in ('malfunctions', 'optimizer_stats') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); -create function profiler.getlimit() returns integer external name profiler.getlimit; -create procedure profiler.setlimit(lim integer) external name profiler.setlimit; -drop procedure profiler.setpoolsize; -drop procedure profiler.setstream; -insert into sys.systemfunctions (select id from sys.functions where name in ('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name = 'profiler') and id not in (select function_id from sys.systemfunctions)); -ALTER TABLE sys.keywords SET READ ONLY; -ALTER TABLE sys.table_types SET READ ONLY; -ALTER TABLE sys.dependency_types SET READ ONLY; -CREATE TABLE sys.function_types ( -function_type_id SMALLINT NOT NULL PRIMARY KEY, -function_type_name VARCHAR(30) NOT NULL UNIQUE); -INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES -(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4, 'Filter function'), (5, 'Function returning a table'), -(6, 'Analytic function'), (7, 'Loader function'); -ALTER TABLE sys.function_types SET READ ONLY; -CREATE TABLE sys.function_languages ( -language_id SMALLINT NOT NULL PRIMARY KEY, -language_name VARCHAR(20) NOT NULL UNIQUE); -INSERT INTO sys.function_languages (language_id, language_name) VALUES -(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (6, 'Python'), (7, 'Python Mapped'), (8, 'Python2'), (9, 'Python2 Mapped'), (10, 'Python3'), (11, 'Python3 Mapped'); -ALTER TABLE sys.function_languages SET READ ONLY; -CREATE TABLE sys.key_types ( -key_type_id SMALLINT NOT NULL PRIMARY KEY, -key_type_name VARCHAR(15) NOT NULL UNIQUE); -INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES -(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key'); -ALTER TABLE sys.key_types SET READ ONLY; -CREATE TABLE sys.index_types ( -index_type_id SMALLINT NOT NULL PRIMARY KEY, -index_type_name VARCHAR(25) NOT NULL UNIQUE); -INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES -(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4, 'Imprint'), (5, 'Ordered'); -ALTER TABLE sys.index_types SET READ ONLY; -CREATE TABLE sys.privilege_codes ( -privilege_code_id INT NOT NULL PRIMARY KEY, -privilege_code_name VARCHAR(30) NOT NULL UNIQUE); -INSERT INTO sys.privilege_codes (privilege_code_id, privilege_code_name) VALUES -(1, 'SELECT'), (2, 'UPDATE'), (4, 'INSERT'), (8, 'DELETE'), (16, 'EXECUTE'), (32, 'GRANT'), -(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7, 'SELECT,INSERT,UPDATE'), -(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'), (12, 'INSERT,DELETE'), -(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15, 'SELECT,INSERT,UPDATE,DELETE'); -ALTER TABLE sys.privilege_codes SET READ ONLY; -update sys._tables set system = true where name in ('function_languages', 'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id = (select id from sys.schemas where name = 'sys'); -delete from sys.systemfunctions where function_id not in (select id from sys.functions); -set schema "sys"; - -# 15:26:18 > -# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21187" "--port=38946" -# 15:26:18 > +# 12:22:32 > +# 12:22:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1798" "--port=37256" +# 12:22:32 > #select 1; % .L2 # table_name 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 @@ -25,65 +25,9 @@ stdout of test 'upgrade` in directory 's Ready. -Running database upgrade commands: -set schema "sys"; -delete from sys._columns where table_id = (select id from sys._tables where name = 'connections' and schema_id = (select id from sys.schemas where name = 'sys')); -delete from sys._tables where name = 'connections' and schema_id = (select id from sys.schemas where name = 'sys'); -update sys.functions set side_effect = false where name in ('like', 'ilike') and schema_id = (select id from sys.schemas where name = 'sys'); -drop function sys.malfunctions; -create function sys.malfunctions() returns table("module" string, "function" string, "signature" string, "address" string, "comment" string) external name "manual"."functions"; -drop function sys.optimizer_stats(); -create function sys.optimizer_stats() returns table (optname string, count int, timing bigint) external name inspect.optimizer_stats; -insert into sys.systemfunctions (select id from sys.functions where name in ('malfunctions', 'optimizer_stats') and schema_id = (select id from sys.schemas where name = 'sys') and id not in (select function_id from sys.systemfunctions)); -create function profiler.getlimit() returns integer external name profiler.getlimit; -create procedure profiler.setlimit(lim integer) external name profiler.setlimit; -drop procedure profiler.setpoolsize; -drop procedure profiler.setstream; -insert into sys.systemfunctions (select id from sys.functions where name in ('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name = 'profiler') and id not in (select function_id from sys.systemfunctions)); -ALTER TABLE sys.keywords SET READ ONLY; -ALTER TABLE sys.table_types SET READ ONLY; -ALTER TABLE sys.dependency_types SET READ ONLY; -CREATE TABLE sys.function_types ( -function_type_id SMALLINT NOT NULL PRIMARY KEY, -function_type_name VARCHAR(30) NOT NULL UNIQUE); -INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES -(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4, 'Filter function'), (5, 'Function returning a table'), -(6, 'Analytic function'), (7, 'Loader function'); -ALTER TABLE sys.function_types SET READ ONLY; -CREATE TABLE sys.function_languages ( -language_id SMALLINT NOT NULL PRIMARY KEY, -language_name VARCHAR(20) NOT NULL UNIQUE); -INSERT INTO sys.function_languages (language_id, language_name) VALUES -(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (6, 'Python'), (7, 'Python Mapped'), (8, 'Python2'), (9, 'Python2 Mapped'), (10, 'Python3'), (11, 'Python3 Mapped'); -ALTER TABLE sys.function_languages SET READ ONLY; -CREATE TABLE sys.key_types ( -key_type_id SMALLINT NOT NULL PRIMARY KEY, -key_type_name VARCHAR(15) NOT NULL UNIQUE); -INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES -(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key'); -ALTER TABLE sys.key_types SET READ ONLY; -CREATE TABLE sys.index_types ( -index_type_id SMALLINT NOT NULL PRIMARY KEY, -index_type_name VARCHAR(25) NOT NULL UNIQUE); -INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES -(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4, 'Imprint'), (5, 'Ordered'); -ALTER TABLE sys.index_types SET READ ONLY; -CREATE TABLE sys.privilege_codes ( -privilege_code_id INT NOT NULL PRIMARY KEY, -privilege_code_name VARCHAR(30) NOT NULL UNIQUE); -INSERT INTO sys.privilege_codes (privilege_code_id, privilege_code_name) VALUES -(1, 'SELECT'), (2, 'UPDATE'), (4, 'INSERT'), (8, 'DELETE'), (16, 'EXECUTE'), (32, 'GRANT'), -(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7, 'SELECT,INSERT,UPDATE'), -(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'), (12, 'INSERT,DELETE'), -(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15, 'SELECT,INSERT,UPDATE,DELETE'); -ALTER TABLE sys.privilege_codes SET READ ONLY; -update sys._tables set system = true where name in ('function_languages', 'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id = (select id from sys.schemas where name = 'sys'); -delete from sys.systemfunctions where function_id not in (select id from sys.functions); -set schema "sys"; - -# 15:41:19 > -# 15:41:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-7576" "--port=32696" -# 15:41:19 > +# 13:21:57 > +# 13:21:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-29247" "--port=33065" +# 13:21:57 > #select 1; % .L2 # table_name 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 @@ -63,5142 +63,5190 @@ insert into sys.types values (31, '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 (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11356, 32, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11357, 32, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11358, 32, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11414, 32, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11415, 32, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11416, 32, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (33, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11359, 33, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11360, 33, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11361, 33, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11417, 33, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11418, 33, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11419, 33, 'arg_2', 'mbr', 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 (11362, 34, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11363, 34, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11364, 34, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11420, 34, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11421, 34, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11422, 34, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (35, 'mbr_above', 'mbrAbove', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11365, 35, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11366, 35, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11367, 35, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11423, 35, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11424, 35, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11425, 35, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11368, 36, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11369, 36, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11370, 36, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11426, 36, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11427, 36, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11428, 36, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (37, 'mbr_below', 'mbrBelow', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11371, 37, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11372, 37, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11373, 37, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11429, 37, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11430, 37, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11431, 37, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11374, 38, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11375, 38, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11376, 38, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11432, 38, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11433, 38, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11434, 38, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (39, 'mbr_right', 'mbrRight', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11377, 39, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11378, 39, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11379, 39, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11435, 39, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11436, 39, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11437, 39, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11380, 40, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11381, 40, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11382, 40, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11438, 40, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11439, 40, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11440, 40, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (41, 'mbr_left', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11383, 41, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11384, 41, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11385, 41, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11441, 41, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11442, 41, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11443, 41, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (42, 'mbr_overlap_or_above', 'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11386, 42, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11387, 42, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11388, 42, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11444, 42, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11445, 42, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11446, 42, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (43, 'mbr_overlap_or_above', 'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11389, 43, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11390, 43, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11391, 43, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11447, 43, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11448, 43, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11449, 43, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (44, 'mbr_overlap_or_below', 'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11392, 44, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11393, 44, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11394, 44, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11450, 44, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11451, 44, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11452, 44, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (45, 'mbr_overlap_or_below', 'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11395, 45, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11396, 45, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11397, 45, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11453, 45, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11454, 45, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11455, 45, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (46, 'mbr_overlap_or_right', 'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11398, 46, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11399, 46, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11400, 46, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11456, 46, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11457, 46, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11458, 46, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (47, 'mbr_overlap_or_right', 'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11401, 47, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11402, 47, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11403, 47, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11459, 47, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11460, 47, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11461, 47, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (48, 'mbr_overlap_or_left', 'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11404, 48, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11405, 48, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11406, 48, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11462, 48, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11463, 48, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11464, 48, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (49, 'mbr_overlap_or_left', 'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11407, 49, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11408, 49, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11409, 49, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11465, 49, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11466, 49, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11467, 49, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (50, 'mbr_contains', 'mbrContains', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11410, 50, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11411, 50, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11412, 50, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11468, 50, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11469, 50, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11470, 50, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (51, 'mbr_contains', 'mbrContains', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11413, 51, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11414, 51, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (11415, 51, 'arg_2', 'mbr', 0, 0, 1, 2); +insert into sys.args values (11471, 51, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11472, 51, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (11473, 51, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (52, 'mbr_contained', 'mbrContained', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11416, 52, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11417, 52, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (11418, 52, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (11474, 52, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (11475, 52, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (11476, 52, 'arg_2', 'geometry', 0, 0, 1, 2); insert into sys.functions values (53, 'mbr_contained', 'mbrContained', 'geom', 0, 1, false, false, false, 2000); -insert into sys.args values (11419, 53, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (11420, 53, 'arg_1', 'mbr', 0, 0, 1, 1); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list