Changeset: 9da253fc35bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9da253fc35bf
Modified Files:
sql/include/sql_catalog.h
sql/storage/bat/bat_logger.c
sql/storage/store.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.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:
Fix upgrade code; fix column type; approve upgrade tests.
diffs (truncated from 36853 to 300 lines):
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -548,7 +548,7 @@ typedef struct sql_table {
sht type; /* table, view, etc */
sht access; /* writable, readonly, appendonly */
bit system; /* system or user table */
- bit properties; /* used for merge_tables */
+ bte properties; /* used for merge_tables */
temp_t persistence; /* persistent, global or local temporary */
ca_t commit_action; /* on commit action */
char *query; /* views may require some query */
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -704,10 +704,10 @@ bl_postversion(void *lg)
"type_digits", &eight,
"type_scale", &zero,
"table_id", &tid,
- "default", bte_nil,
+ "default", str_nil,
"null", &t,
"number", &col,
- "storage", bte_nil,
+ "storage", str_nil,
NULL) != GDK_SUCCEED)
return GDK_FAIL;
id++;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -780,7 +780,7 @@ load_table(sql_trans *tr, sql_schema *s,
rs = table_funcs.rids_select(tr, partitions_table_id, &t->base.id,
&t->base.id, NULL);
if((rid = table_funcs.rids_next(rs)) != oid_nil) {
v = table_funcs.column_find_value(tr,
find_sql_column(partitions, "type"), rid);
- t->properties |= *(bit*)v;
+ t->properties |= *(bte*)v;
_DELETE(v);
if(isPartitionedByColumnTable(t)) {
@@ -1473,7 +1473,7 @@ bootstrap_create_column(sql_trans *tr, s
}
static sql_table *
-create_sql_table_with_id(sql_allocator *sa, int id, const char *name, sht
type, bit system, int persistence, int commit_action, bit properties)
+create_sql_table_with_id(sql_allocator *sa, int id, const char *name, sht
type, bit system, int persistence, int commit_action, bte properties)
{
sql_table *t = SA_ZNEW(sa, sql_table);
@@ -1504,7 +1504,7 @@ create_sql_table_with_id(sql_allocator *
}
sql_table *
-create_sql_table(sql_allocator *sa, const char *name, sht type, bit system,
int persistence, int commit_action, bit properties)
+create_sql_table(sql_allocator *sa, const char *name, sht type, bit system,
int persistence, int commit_action, bte properties)
{
return create_sql_table_with_id(sa, next_oid(), name, type, system,
persistence, commit_action, properties);
}
@@ -5049,7 +5049,7 @@ sql_trans_del_table(sql_trans *tr, sql_t
}
sql_table *
-sql_trans_create_table(sql_trans *tr, sql_schema *s, const char *name, const
char *sql, int tt, bit system, int persistence, int commit_action, int sz, bit
properties)
+sql_trans_create_table(sql_trans *tr, sql_schema *s, const char *name, const
char *sql, int tt, bit system, int persistence, int commit_action, int sz, bte
properties)
{
sql_table *t = create_sql_table(tr->sa, name, tt, system, persistence,
commit_action, properties);
sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
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
@@ -35,14 +35,6 @@ commit;
Running database upgrade commands:
set schema sys;
-alter table sys.table_types set read write;
-drop table sys.table_types;
-create table sys.table_types (table_type_id SMALLINT NOT NULL PRIMARY KEY,
-table_type_name VARCHAR(50) NOT NULL UNIQUE);
-insert into sys.table_types values (0, 'TABLE'), (1, 'VIEW'), (3, 'MERGE
TABLE'), (4, 'STREAM TABLE'), (5, 'REMOTE TABLE'), (6, 'REPLICA TABLE'), (10,
'SYSTEM TABLE'), (11, 'SYSTEM VIEW'), (12, 'MERGE TABLE PARTITION BY VALUES ON
COLUMN'), (13, 'MERGE TABLE PARTITION BY RANGE ON COLUMN'), (14, 'MERGE TABLE
PARTITION BY VALUES USING EXPRESSION'), (15, 'MERGE TABLE PARTITION BY RANGE
USING EXPRESSION'), (20, 'GLOBAL TEMPORARY TABLE'), (30, 'LOCAL TEMPORARY
TABLE');
-grant select on sys.table_types to public;
-alter table sys.table_types set read only;
-update sys._tables set system = true where name = 'table_types' and schema_id
= (select id from sys.schemas where name = 'sys');
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;
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
@@ -35,14 +35,6 @@ commit;
Running database upgrade commands:
set schema sys;
-alter table sys.table_types set read write;
-drop table sys.table_types;
-create table sys.table_types (table_type_id SMALLINT NOT NULL PRIMARY KEY,
-table_type_name VARCHAR(50) NOT NULL UNIQUE);
-insert into sys.table_types values (0, 'TABLE'), (1, 'VIEW'), (3, 'MERGE
TABLE'), (4, 'STREAM TABLE'), (5, 'REMOTE TABLE'), (6, 'REPLICA TABLE'), (10,
'SYSTEM TABLE'), (11, 'SYSTEM VIEW'), (12, 'MERGE TABLE PARTITION BY VALUES ON
COLUMN'), (13, 'MERGE TABLE PARTITION BY RANGE ON COLUMN'), (14, 'MERGE TABLE
PARTITION BY VALUES USING EXPRESSION'), (15, 'MERGE TABLE PARTITION BY RANGE
USING EXPRESSION'), (20, 'GLOBAL TEMPORARY TABLE'), (30, 'LOCAL TEMPORARY
TABLE');
-grant select on sys.table_types to public;
-alter table sys.table_types set read only;
-update sys._tables set system = true where name = 'table_types' and schema_id
= (select id from sys.schemas where name = 'sys');
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;
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
@@ -35,14 +35,6 @@ commit;
Running database upgrade commands:
set schema sys;
-alter table sys.table_types set read write;
-drop table sys.table_types;
-create table sys.table_types (table_type_id SMALLINT NOT NULL PRIMARY KEY,
-table_type_name VARCHAR(50) NOT NULL UNIQUE);
-insert into sys.table_types values (0, 'TABLE'), (1, 'VIEW'), (3, 'MERGE
TABLE'), (4, 'STREAM TABLE'), (5, 'REMOTE TABLE'), (6, 'REPLICA TABLE'), (10,
'SYSTEM TABLE'), (11, 'SYSTEM VIEW'), (12, 'MERGE TABLE PARTITION BY VALUES ON
COLUMN'), (13, 'MERGE TABLE PARTITION BY RANGE ON COLUMN'), (14, 'MERGE TABLE
PARTITION BY VALUES USING EXPRESSION'), (15, 'MERGE TABLE PARTITION BY RANGE
USING EXPRESSION'), (20, 'GLOBAL TEMPORARY TABLE'), (30, 'LOCAL TEMPORARY
TABLE');
-grant select on sys.table_types to public;
-alter table sys.table_types set read only;
-update sys._tables set system = true where name = 'table_types' and schema_id
= (select id from sys.schemas where name = 'sys');
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;
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, true);
-insert into sys.args values (18553, 31, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18554, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18555, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18554, 31, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18555, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18556, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true);
-insert into sys.args values (18556, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18557, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18558, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18557, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18558, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18559, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18559, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18560, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18561, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18560, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18561, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18562, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18562, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18563, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18564, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18563, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18564, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18565, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18565, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18566, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18567, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18566, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18567, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18568, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18568, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18569, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18570, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18569, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18570, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18571, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18571, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18572, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18573, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18572, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18573, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18574, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18574, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18575, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18576, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18575, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18576, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18577, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (39, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18577, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18578, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18579, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18578, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18579, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18580, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18580, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18581, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18582, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18581, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18582, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18583, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (41, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18583, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18584, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18585, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18584, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18585, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18586, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (42, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18586, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18587, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18588, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18587, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18588, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18589, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (43, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18589, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18590, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18591, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18590, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18591, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18592, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (44, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18592, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18593, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18594, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18593, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18594, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18595, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (45, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18595, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18596, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18597, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18596, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18597, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18598, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (46, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18598, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18599, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18600, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18599, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18600, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18601, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (47, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18601, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18602, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18603, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18602, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18603, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18604, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (48, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true);
-insert into sys.args values (18604, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18605, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18606, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18605, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18606, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18607, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (49, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (18607, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18608, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18609, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18608, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18609, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18610, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (50, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (18610, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18611, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18612, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18611, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18612, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18613, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (51, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (18613, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18614, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18615, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18614, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18615, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18616, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (52, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (18616, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18617, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18618, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18617, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18618, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18619, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (53, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18619, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18620, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18621, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18620, 53, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18621, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (18622, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (54, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true);
-insert into sys.args values (18622, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (18623, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (18624, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (18623, 54, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (18624, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (18625, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (55, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true);
-insert into sys.args values (18625, 55, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (18626, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (18627, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (18626, 55, 'res_0', 'double', 53, 0, 0, 0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
