Changeset: eeb7f6449b1e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eeb7f6449b1e
Modified Files:
        sql/test/Tests/fsum.sql
        sql/test/Tests/fsum.stable.out
        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:

Merge with Mar2018 branch.


diffs (truncated from 28410 to 300 lines):

diff --git a/sql/test/Tests/fsum.sql b/sql/test/Tests/fsum.sql
--- a/sql/test/Tests/fsum.sql
+++ b/sql/test/Tests/fsum.sql
@@ -3133,7 +3133,7 @@ 0.001004016064257028 16
 0.001002004008016032 16
 -0.001001001001001001 16
 0.001 16
-select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40) group by gid 
order by gid;
+select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by 
gid order by gid;
 -- these should all produce overflow
 select sum(val) from t where gid = 14;
 select sum(val) from t where gid = 20;
diff --git a/sql/test/Tests/fsum.stable.out b/sql/test/Tests/fsum.stable.out
--- a/sql/test/Tests/fsum.stable.out
+++ b/sql/test/Tests/fsum.stable.out
@@ -49,9 +49,9 @@ Ready.
 #1.0 15
 #8.988465674311579e+307 25
 [ 3131 ]
-#select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
11, 12, 13, 15, 16, 17, 18, 19, 22, 31, 33, 39, 40) group by gid order by gid;
-% sys.t,       sys.L5 # table_name
-% gid, L4 # name
+#select gid, sum(val) from t where gid in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
11, 12, 13, 15, 16, 17, 18, 19, 22, 23, 31, 33, 35, 37, 39, 40, 41) group by 
gid order by gid;
+% sys.t,       sys.L3 # table_name
+% gid, L3 # name
 % int, double # type
 % 2,   24 # length
 [ 1,   0       ]
@@ -80,6 +80,7 @@ Ready.
 [ 37,  -1.797693135e+308       ]
 [ 39,  1.797693135e+308        ]
 [ 40,  1.697693135e+308        ]
+[ 41,  1e+16   ]
 #drop table t;
 
 # 10:54:43 >  
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,61 +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";
-drop function sys.dependencies_functions_os_triggers();
-CREATE FUNCTION dependencies_functions_on_triggers()
-RETURNS TABLE (sch varchar(100), usr varchar(100), dep_type varchar(32))
-RETURN TABLE (SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f, 
triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id 
=tri.id AND dep.depend_type = 8);
-insert into sys.systemfunctions (select id from sys.functions where name in 
('dependencies_functions_on_triggers') and schema_id = (select id from 
sys.schemas where name = 'sys') and id not in (select function_id from 
sys.systemfunctions));
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-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) 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 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, 'schema', 'sys.schemas' 
FROM sys.schemas UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'sys._tables' FROM sys._tables UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'tmp._tables' FROM tmp._tables UNION ALL
-SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, 'column', 
'sys._columns' 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' 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, 'key', 
'sys.keys' 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' 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, 'index', 
'sys.idxs' 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' 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, 'trigger', 
'sys.triggers' 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' FROM tmp.triggers g JOIN tmp._tables t ON g.table_id = t.id 
UNION ALL
-SELECT id, name, schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when type = 2 then 'procedure' else 
'function' end, 'sys.functions' FROM sys.functions UNION ALL
-SELECT a.id, a.name, f.schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when f.type = 2 then 'procedure arg' else 
'function arg' end, 'sys.args' FROM sys.args a JOIN sys.functions f ON 
a.func_id = f.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' FROM sys.sequences 
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' FROM sys.types WHERE id > 2000 
/* exclude system types to prevent duplicates with auths.id */
- ORDER BY id;
-GRANT SELECT ON sys.ids TO PUBLIC;
-CREATE VIEW sys.dependencies_vw AS
-SELECT d.id, i1.obj_type, i1.name,
-       d.depend_id as used_by_id, i2.obj_type as used_by_obj_type, i2.name as 
used_by_name,
-       d.depend_type, dt.dependency_type_name
-  FROM sys.dependencies d
-  JOIN sys.ids i1 ON d.id = i1.id
-  JOIN sys.ids i2 ON d.depend_id = i2.id
-  JOIN sys.dependency_types dt ON d.depend_type = dt.dependency_type_id
- ORDER BY id, depend_id;
-GRANT SELECT ON sys.dependencies_vw TO PUBLIC;
-update sys._tables set system = true where name in ('ids', 'dependencies_vw') 
and schema_id in (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-drop function sys.chi2prob(double, double);
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
 set schema sys;
 create aggregate sys.group_concat(str string) returns string external name 
"aggr"."str_group_concat";
 grant execute on aggregate sys.group_concat(string) to public;
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
@@ -17,61 +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";
-drop function sys.dependencies_functions_os_triggers();
-CREATE FUNCTION dependencies_functions_on_triggers()
-RETURNS TABLE (sch varchar(100), usr varchar(100), dep_type varchar(32))
-RETURN TABLE (SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f, 
triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id 
=tri.id AND dep.depend_type = 8);
-insert into sys.systemfunctions (select id from sys.functions where name in 
('dependencies_functions_on_triggers') and schema_id = (select id from 
sys.schemas where name = 'sys') and id not in (select function_id from 
sys.systemfunctions));
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-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) 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 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, 'schema', 'sys.schemas' 
FROM sys.schemas UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'sys._tables' FROM sys._tables UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'tmp._tables' FROM tmp._tables UNION ALL
-SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, 'column', 
'sys._columns' 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' 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, 'key', 
'sys.keys' 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' 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, 'index', 
'sys.idxs' 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' 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, 'trigger', 
'sys.triggers' 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' FROM tmp.triggers g JOIN tmp._tables t ON g.table_id = t.id 
UNION ALL
-SELECT id, name, schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when type = 2 then 'procedure' else 
'function' end, 'sys.functions' FROM sys.functions UNION ALL
-SELECT a.id, a.name, f.schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when f.type = 2 then 'procedure arg' else 
'function arg' end, 'sys.args' FROM sys.args a JOIN sys.functions f ON 
a.func_id = f.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' FROM sys.sequences 
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' FROM sys.types WHERE id > 2000 
/* exclude system types to prevent duplicates with auths.id */
- ORDER BY id;
-GRANT SELECT ON sys.ids TO PUBLIC;
-CREATE VIEW sys.dependencies_vw AS
-SELECT d.id, i1.obj_type, i1.name,
-       d.depend_id as used_by_id, i2.obj_type as used_by_obj_type, i2.name as 
used_by_name,
-       d.depend_type, dt.dependency_type_name
-  FROM sys.dependencies d
-  JOIN sys.ids i1 ON d.id = i1.id
-  JOIN sys.ids i2 ON d.depend_id = i2.id
-  JOIN sys.dependency_types dt ON d.depend_type = dt.dependency_type_id
- ORDER BY id, depend_id;
-GRANT SELECT ON sys.dependencies_vw TO PUBLIC;
-update sys._tables set system = true where name in ('ids', 'dependencies_vw') 
and schema_id in (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-drop function sys.chi2prob(double, double);
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
 set schema sys;
 create aggregate sys.group_concat(str string) returns string external name 
"aggr"."str_group_concat";
 grant execute on aggregate sys.group_concat(string) to public;
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
@@ -17,61 +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";
-drop function sys.dependencies_functions_os_triggers();
-CREATE FUNCTION dependencies_functions_on_triggers()
-RETURNS TABLE (sch varchar(100), usr varchar(100), dep_type varchar(32))
-RETURN TABLE (SELECT f.name, tri.name, 'DEP_TRIGGER' from functions as f, 
triggers as tri, dependencies as dep where dep.id = f.id AND dep.depend_id 
=tri.id AND dep.depend_type = 8);
-insert into sys.systemfunctions (select id from sys.functions where name in 
('dependencies_functions_on_triggers') and schema_id = (select id from 
sys.schemas where name = 'sys') and id not in (select function_id from 
sys.systemfunctions));
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-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) 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 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, 'schema', 'sys.schemas' 
FROM sys.schemas UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'sys._tables' FROM sys._tables UNION ALL
-SELECT id, name, schema_id, id as table_id, name as table_name, case when type 
= 1 then 'view' else 'table' end, 'tmp._tables' FROM tmp._tables UNION ALL
-SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, 'column', 
'sys._columns' 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' 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, 'key', 
'sys.keys' 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' 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, 'index', 
'sys.idxs' 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' 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, 'trigger', 
'sys.triggers' 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' FROM tmp.triggers g JOIN tmp._tables t ON g.table_id = t.id 
UNION ALL
-SELECT id, name, schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when type = 2 then 'procedure' else 
'function' end, 'sys.functions' FROM sys.functions UNION ALL
-SELECT a.id, a.name, f.schema_id, cast(null as int) as table_id, cast(null as 
varchar(124)) as table_name, case when f.type = 2 then 'procedure arg' else 
'function arg' end, 'sys.args' FROM sys.args a JOIN sys.functions f ON 
a.func_id = f.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' FROM sys.sequences 
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' FROM sys.types WHERE id > 2000 
/* exclude system types to prevent duplicates with auths.id */
- ORDER BY id;
-GRANT SELECT ON sys.ids TO PUBLIC;
-CREATE VIEW sys.dependencies_vw AS
-SELECT d.id, i1.obj_type, i1.name,
-       d.depend_id as used_by_id, i2.obj_type as used_by_obj_type, i2.name as 
used_by_name,
-       d.depend_type, dt.dependency_type_name
-  FROM sys.dependencies d
-  JOIN sys.ids i1 ON d.id = i1.id
-  JOIN sys.ids i2 ON d.depend_id = i2.id
-  JOIN sys.dependency_types dt ON d.depend_type = dt.dependency_type_id
- ORDER BY id, depend_id;
-GRANT SELECT ON sys.dependencies_vw TO PUBLIC;
-update sys._tables set system = true where name in ('ids', 'dependencies_vw') 
and schema_id in (select id from sys.schemas where name = 'sys');
-set schema "sys";
-commit;
-
-Running database upgrade commands:
-set schema "sys";
-drop function sys.chi2prob(double, double);
-delete from systemfunctions where function_id not in (select id from 
functions);
-set schema "sys";
-commit;
-
-Running database upgrade commands:
 set schema sys;
 create aggregate sys.group_concat(str string) returns string external name 
"aggr"."str_group_concat";
 grant execute on aggregate sys.group_concat(string) to public;
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
@@ -54,5241 +54,5241 @@ 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 (18492, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18493, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18494, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18516, 31, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18517, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18518, 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 (18495, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18496, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18497, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18519, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18520, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18521, 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 (18498, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18499, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18500, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18522, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18523, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18524, 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 (18501, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18502, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18503, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18525, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18526, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18527, 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 (18504, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18505, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18506, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18528, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18529, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18530, 35, 'arg_2', 'geometry', 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 (18507, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18508, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18509, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18531, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18532, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18533, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
 insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18510, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18511, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18512, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18534, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18535, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18536, 37, 'arg_2', 'geometry', 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 (18513, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18514, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18515, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18537, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18538, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18539, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
 insert into sys.functions values (39, 'mbr_left', 'mbrLeft', 'geom', 0, 1, 
false, false, false, 2000);
-insert into sys.args values (18516, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18517, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18518, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18540, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18541, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18542, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to