Changeset: c0593fb16b19 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0593fb16b19
Modified Files:
sql/backends/monet5/sql_upgrades.c
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/emptydb/Tests/check.stable.out
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.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:
Improve and approve upgrades.
diffs (truncated from 99999 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
@@ -2374,6 +2374,28 @@ sql_update_default(Client c, mvc *sql, c
pos = snprintf(buf, bufsize, "set schema \"sys\";\n");
+ /* 20_vacuum.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop procedure
sys.shrink(string, string);\n"
+ "drop procedure
sys.reuse(string, string);\n"
+ "drop procedure
sys.vacuum(string, string);\n");
+
+ /* 25_debug.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop procedure
sys.flush_log();\n");
+
+ /* 41_json.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "drop function
json.isobject(string);\n"
+ "drop function
json.isarray(string);\n"
+ "drop function
json.isvalid(json);\n"
+ "create function
json.isvalid(js json)\n"
+ "returns bool begin
return true; end;\n"
+ "grant execute on
function json.isvalid(json) to public;\n"
+ "update sys.functions
set system = true"
+ " where schema_id =
(select id from sys.schemas where name = 'json')"
+ " and name =
'isvalid';\n");
+
/* 51_sys_schema_extensions, remove stream table
entries and update window function description */
pos += snprintf(buf + pos, bufsize - pos,
"ALTER TABLE sys.keywords SET READ
WRITE;\n"
@@ -3113,7 +3135,7 @@ sql_update_default(Client c, mvc *sql, c
" SET M = (SELECT MAX(c.id)
FROM sys.columns c, sys.tables t WHERE c.table_id = t.id AND t.name = tbl);\n"
"\n"
" WHILE (k < M) DO\n"
- " SET k = (SELECT
MIN(c.id) FROM sys.columns c, tables t WHERE c.table_id = t.id AND t.name = tbl
AND c.id > k);\n"
+ " SET k = (SELECT
MIN(c.id) FROM sys.columns c, sys.tables t WHERE c.table_id = t.id AND t.name =
tbl AND c.id > k);\n"
" SET cname = (SELECT
c.name FROM sys.columns c WHERE c.id = k);\n"
" SET ctype = (SELECT
c.type FROM sys.columns c WHERE c.id = k);\n"
" SET COPY_INTO_STMT =
(COPY_INTO_STMT || ', ' || sys.DQ(cname));\n"
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
@@ -2,4208 +2,4222 @@ 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, 'hge', 'hugeint', 128, 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, 'hge', 'decimal', 38, 1, 10, 10, 2000);
-insert into sys.types values (18, 'flt', 'real', 24, 2, 2, 11, 2000);
-insert into sys.types values (19, 'dbl', 'double', 53, 2, 2, 11, 2000);
-insert into sys.types values (20, 'int', 'month_interval', 3, 0, 10, 8, 2000);
-insert into sys.types values (21, 'lng', 'day_interval', 4, 0, 10, 9, 2000);
-insert into sys.types values (22, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
-insert into sys.types values (23, 'daytime', 'time', 7, 0, 0, 12, 2000);
-insert into sys.types values (24, 'daytime', 'timetz', 7, 1, 0, 13, 2000);
-insert into sys.types values (25, 'date', 'date', 0, 0, 0, 14, 2000);
-insert into sys.types values (26, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000);
-insert into sys.types values (27, 'timestamp', 'timestamptz', 7, 1, 0, 16,
2000);
-insert into sys.types values (28, 'blob', 'blob', 0, 0, 0, 5, 2000);
-insert into sys.types values (31, 'wkb', 'geometry', 0, 0, 0, 17, 2000);
-insert into sys.types values (32, 'wkba', 'geometrya', 0, 0, 0, 18, 2000);
-insert into sys.types values (33, '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', 63, 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, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
+insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000);
+insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000);
+insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000);
+insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000);
+insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000);
+insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000);
+insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000);
+insert into sys.types values (21, 'int', 'month_interval', 3, 0, 10, 8, 2000);
+insert into sys.types values (22, 'lng', 'day_interval', 4, 0, 10, 9, 2000);
+insert into sys.types values (23, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
+insert into sys.types values (24, 'daytime', 'time', 7, 0, 0, 12, 2000);
+insert into sys.types values (25, 'daytime', 'timetz', 7, 1, 0, 13, 2000);
+insert into sys.types values (26, 'date', 'date', 0, 0, 0, 14, 2000);
+insert into sys.types values (27, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000);
+insert into sys.types values (28, 'timestamp', 'timestamptz', 7, 1, 0, 16,
2000);
+insert into sys.types values (29, 'blob', 'blob', 0, 0, 0, 5, 2000);
+insert into sys.types values (32, 'wkb', 'geometry', 0, 0, 0, 17, 2000);
+insert into sys.types values (33, 'wkba', 'geometrya', 0, 0, 0, 18, 2000);
+insert into sys.types values (34, 'mbr', 'mbr', 0, 0, 0, 18, 2000);
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 (29, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
-insert into sys.args values (41375, 29, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (41376, 29, 'arg_1', 'blob', 0, 0, 1, 1);
-insert into sys.functions values (30, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
-insert into sys.args values (41377, 30, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (41378, 30, 'arg_1', 'blob', 0, 0, 1, 1);
-insert into sys.functions values (34, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (41379, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41380, 34, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41381, 34, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (30, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
+insert into sys.args values (41396, 30, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (41397, 30, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.functions values (31, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
+insert into sys.args values (41398, 31, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (41399, 31, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (35, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (41382, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41383, 35, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41384, 35, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (36, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41385, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41386, 36, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41387, 36, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41400, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41401, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41402, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (36, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
+insert into sys.args values (41403, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41404, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41405, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (37, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41388, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41389, 37, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41390, 37, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (38, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41391, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41392, 38, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41393, 38, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41406, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41407, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41408, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (38, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41409, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41410, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41411, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (39, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41394, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41395, 39, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41396, 39, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (40, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41397, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41398, 40, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41399, 40, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41412, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41413, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41414, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (40, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41415, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41416, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41417, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (41, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41400, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41401, 41, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41402, 41, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (42, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41403, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41404, 42, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41405, 42, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41418, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41419, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41420, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (42, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41421, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41422, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41423, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (43, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41406, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41407, 43, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41408, 43, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (44, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41409, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41410, 44, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41411, 44, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41424, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41425, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41426, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (44, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41427, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41428, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41429, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (45, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41412, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41413, 45, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41414, 45, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (46, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41415, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41416, 46, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41417, 46, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41430, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41431, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41432, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (46, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41433, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41434, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41435, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (47, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41418, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41419, 47, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41420, 47, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (48, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41421, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41422, 48, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41423, 48, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41436, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41437, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41438, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (48, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41439, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41440, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41441, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (49, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41424, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41425, 49, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41426, 49, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (50, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41427, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41428, 50, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41429, 50, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41442, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41443, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41444, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (50, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41445, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41446, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41447, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (51, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41430, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41431, 51, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41432, 51, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (52, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41433, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41434, 52, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41435, 52, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41448, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41449, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41450, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (52, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41451, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41452, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41453, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (53, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41436, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41437, 53, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41438, 53, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (54, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41439, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41440, 54, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41441, 54, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41454, 53, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41455, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41456, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (54, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41457, 54, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41458, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41459, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (55, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41442, 55, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41443, 55, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41444, 55, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (56, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41445, 56, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41446, 56, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41447, 56, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (41460, 55, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41461, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41462, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (56, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41463, 56, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41464, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41465, 56, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (57, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41448, 57, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41449, 57, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41450, 57, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (58, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true, true);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
