Changeset: 179f82506958 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=179f82506958
Modified Files:
sql/backends/monet5/sql_upgrades.c
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.powerpc64
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/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-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (truncated from 130619 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
@@ -2109,15 +2109,14 @@ SQLupgrades(Client c, mvc *m)
if ((t = mvc_bind_table(m, s, "systemfunctions")) != NULL &&
t->type == tt_table) {
- if ((err = sql_update_apr2019(c, m)) != NULL) {
+ if (!hugeint_upgraded &&
+ (err = sql_fix_system_tables(c, m)) != NULL) {
fprintf(stderr, "!%s\n", err);
freeException(err);
}
- if (!hugeint_upgraded) {
- if ((err = sql_fix_system_tables(c, m)) != NULL) {
- fprintf(stderr, "!%s\n", err);
- freeException(err);
- }
+ if ((err = sql_update_apr2019(c, m)) != NULL) {
+ fprintf(stderr, "!%s\n", err);
+ freeException(err);
}
}
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
@@ -17,41 +17,6 @@ stdout of test 'upgrade` in directory 's
# 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;
-grant execute on function sys.queue to public;
-grant select on sys.queue to public;
-ALTER TABLE sys.keywords SET READ WRITE;
-INSERT INTO sys.keywords VALUES ('WINDOW');
-DROP VIEW sys.var_values;
-CREATE VIEW sys.var_values (var_name, value) AS
-SELECT 'cache' AS var_name, convert(cache, varchar(10)) AS value UNION ALL
-SELECT 'current_role', current_role UNION ALL
-SELECT 'current_schema', current_schema UNION ALL
-SELECT 'current_timezone', current_timezone UNION ALL
-SELECT 'current_user', current_user UNION ALL
-SELECT 'debug', debug UNION ALL
-SELECT 'last_id', last_id UNION ALL
-SELECT 'optimizer', optimizer UNION ALL
-SELECT 'pi', pi() UNION ALL
-SELECT 'rowcnt', rowcnt;
-UPDATE sys._tables SET system = true WHERE name = 'var_values' AND schema_id =
(SELECT id FROM sys.schemas WHERE name = 'sys');
-GRANT SELECT ON sys.var_values TO PUBLIC;
-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;
@@ -89,5806 +54,5841 @@ insert into sys.types values (32, '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 (28, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true);
-insert into sys.args values (20679, 28, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (20680, 28, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (20672, 28, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (20673, 28, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (29, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20681, 29, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (20682, 29, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (20674, 29, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (20675, 29, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (33, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (20683, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20684, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20685, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20676, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20677, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20678, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (34, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (20686, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20687, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20688, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20679, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20680, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20681, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (35, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20689, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20690, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20691, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20682, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20683, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20684, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20692, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20693, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20694, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20685, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20686, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20687, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (37, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20695, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20696, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20697, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20688, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20689, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20690, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (38, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20698, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20699, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20700, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20691, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20692, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20693, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (39, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20701, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20702, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20703, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20694, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20695, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20696, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (40, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20704, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20705, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20706, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20697, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20698, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20699, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (41, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20707, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20708, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20709, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20700, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20701, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20702, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (42, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20710, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20711, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20712, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20703, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20704, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20705, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (43, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20713, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20714, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20715, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20706, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20707, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20708, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (44, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20716, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20717, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20718, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20709, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20710, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20711, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (45, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20719, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20720, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20721, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20712, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20713, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20714, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (46, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20722, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20723, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20724, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20715, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20716, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20717, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (47, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20725, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20726, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20727, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20718, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20719, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20720, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (48, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20728, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20729, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20730, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20721, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20722, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20723, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (49, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20731, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20732, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20733, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20724, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20725, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20726, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (50, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (20734, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20735, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20736, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20727, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20728, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20729, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (51, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20737, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20738, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20739, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20730, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20731, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20732, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (52, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20740, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20741, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20742, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20733, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20734, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20735, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (53, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20743, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20744, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20745, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20736, 53, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20737, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20738, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (54, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20746, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20747, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20748, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20739, 54, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20740, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20741, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (55, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20749, 55, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20750, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20751, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20742, 55, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20743, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20744, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (56, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20752, 56, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20753, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20754, 56, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20745, 56, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20746, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20747, 56, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (57, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20755, 57, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (20756, 57, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20757, 57, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20748, 57, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (20749, 57, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20750, 57, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (58, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (20758, 58, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (20759, 58, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20760, 58, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20751, 58, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (20752, 58, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20753, 58, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (59, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20761, 59, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20762, 59, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20763, 59, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20754, 59, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20755, 59, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20756, 59, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (60, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20764, 60, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20765, 60, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20766, 60, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20757, 60, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20758, 60, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20759, 60, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (61, 'right_shift', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20767, 61, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20768, 61, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (20769, 61, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (20760, 61, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20761, 61, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (20762, 61, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (62, 'right_shift', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (20770, 62, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (20771, 62, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (20772, 62, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (20763, 62, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (20764, 62, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (20765, 62, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (64, 'not_uniques', 'not_uniques', 'sql', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (20773, 64, 'res_0', 'oid', 63, 0, 0, 0);
-insert into sys.args values (20774, 64, 'arg_1', 'bigint', 64, 0, 1, 1);
+insert into sys.args values (20766, 64, 'res_0', 'oid', 63, 0, 0, 0);
+insert into sys.args values (20767, 64, 'arg_1', 'bigint', 64, 0, 1, 1);
insert into sys.functions values (65, 'not_uniques', 'not_uniques', 'sql', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (20775, 65, 'res_0', 'oid', 63, 0, 0, 0);
-insert into sys.args values (20776, 65, 'arg_1', 'oid', 63, 0, 1, 1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
