Changeset: 66794e0b06dc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66794e0b06dc Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message:
Approve upgrade. diffs (truncated from 31200 to 300 lines): 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 @@ -2,3613 +2,3627 @@ 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', 31, 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, 'bte', 'decimal', 2, 1, 10, 10, 2000); -insert into sys.types values (13, 'sht', 'decimal', 4, 1, 10, 10, 2000); -insert into sys.types values (14, 'int', 'decimal', 9, 1, 10, 10, 2000); -insert into sys.types values (15, 'lng', 'decimal', 18, 1, 10, 10, 2000); -insert into sys.types values (16, 'flt', 'real', 24, 2, 2, 11, 2000); -insert into sys.types values (17, 'dbl', 'double', 53, 2, 2, 11, 2000); -insert into sys.types values (18, 'int', 'month_interval', 3, 0, 10, 8, 2000); -insert into sys.types values (19, 'lng', 'day_interval', 4, 0, 10, 9, 2000); -insert into sys.types values (20, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); -insert into sys.types values (21, 'daytime', 'time', 7, 0, 0, 12, 2000); -insert into sys.types values (22, 'daytime', 'timetz', 7, 1, 0, 13, 2000); -insert into sys.types values (23, 'date', 'date', 0, 0, 0, 14, 2000); -insert into sys.types values (24, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); -insert into sys.types values (25, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); -insert into sys.types values (26, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 17, 2000); -insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); -insert into sys.types values (31, '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', 31, 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, '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, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (18, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (19, 'int', 'month_interval', 3, 0, 10, 8, 2000); +insert into sys.types values (20, 'lng', 'day_interval', 4, 0, 10, 9, 2000); +insert into sys.types values (21, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (22, 'daytime', 'time', 7, 0, 0, 12, 2000); +insert into sys.types values (23, 'daytime', 'timetz', 7, 1, 0, 13, 2000); +insert into sys.types values (24, 'date', 'date', 0, 0, 0, 14, 2000); +insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); +insert into sys.types values (26, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); +insert into sys.types values (27, 'blob', 'blob', 0, 0, 0, 5, 2000); +insert into sys.types values (30, 'wkb', 'geometry', 0, 0, 0, 17, 2000); +insert into sys.types values (31, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); +insert into sys.types values (32, '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 (27, 'length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36538, 27, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (36539, 27, 'arg_1', 'blob', 0, 0, 1, 1); -insert into sys.functions values (28, 'octet_length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36540, 28, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (36541, 28, 'arg_1', 'blob', 0, 0, 1, 1); -insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36542, 32, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36543, 32, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36544, 32, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.functions values (28, 'length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true, false); +insert into sys.args values (36559, 28, 'res_0', 'int', 32, 0, 0, 0); +insert into sys.args values (36560, 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, false); +insert into sys.args values (36561, 29, 'res_0', 'int', 32, 0, 0, 0); +insert into sys.args values (36562, 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, true); -insert into sys.args values (36545, 33, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36546, 33, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36547, 33, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36548, 34, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36549, 34, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36550, 34, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36563, 33, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36564, 33, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36565, 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, true); +insert into sys.args values (36566, 34, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36567, 34, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36568, 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, true); -insert into sys.args values (36551, 35, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36552, 35, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36553, 35, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36554, 36, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36555, 36, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36556, 36, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36569, 35, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36570, 35, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36571, 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, true); +insert into sys.args values (36572, 36, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36573, 36, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36574, 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, true); -insert into sys.args values (36557, 37, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36558, 37, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36559, 37, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36560, 38, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36561, 38, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36562, 38, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36575, 37, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36576, 37, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36577, 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, true); +insert into sys.args values (36578, 38, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36579, 38, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36580, 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, true); -insert into sys.args values (36563, 39, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36564, 39, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36565, 39, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36566, 40, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36567, 40, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36568, 40, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36581, 39, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36582, 39, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36583, 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, true); +insert into sys.args values (36584, 40, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36585, 40, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36586, 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, true); -insert into sys.args values (36569, 41, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36570, 41, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36571, 41, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (42, 'mbr_overlap_or_above', 'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36572, 42, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36573, 42, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36574, 42, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36587, 41, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36588, 41, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36589, 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, true); +insert into sys.args values (36590, 42, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36591, 42, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36592, 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, true); -insert into sys.args values (36575, 43, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36576, 43, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36577, 43, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (44, 'mbr_overlap_or_below', 'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36578, 44, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36579, 44, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36580, 44, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36593, 43, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36594, 43, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36595, 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, true); +insert into sys.args values (36596, 44, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36597, 44, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36598, 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, true); -insert into sys.args values (36581, 45, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36582, 45, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36583, 45, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (46, 'mbr_overlap_or_right', 'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36584, 46, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36585, 46, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36586, 46, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36599, 45, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36600, 45, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36601, 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, true); +insert into sys.args values (36602, 46, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36603, 46, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36604, 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, true); -insert into sys.args values (36587, 47, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36588, 47, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36589, 47, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (48, 'mbr_overlap_or_left', 'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36590, 48, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36591, 48, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36592, 48, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36605, 47, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36606, 47, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36607, 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, true); +insert into sys.args values (36608, 48, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36609, 48, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36610, 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, true); -insert into sys.args values (36593, 49, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36594, 49, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36595, 49, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (50, 'mbr_contains', 'mbrContains', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36596, 50, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36597, 50, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36598, 50, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36611, 49, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36612, 49, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36613, 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, true); +insert into sys.args values (36614, 50, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36615, 50, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36616, 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, true); -insert into sys.args values (36599, 51, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36600, 51, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36601, 51, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (52, 'mbr_contained', 'mbrContained', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36602, 52, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36603, 52, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36604, 52, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36617, 51, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36618, 51, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36619, 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, true); +insert into sys.args values (36620, 52, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36621, 52, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36622, 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, true); -insert into sys.args values (36605, 53, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36606, 53, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36607, 53, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (54, 'mbr_equal', 'mbrEqual', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36608, 54, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36609, 54, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36610, 54, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36623, 53, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36624, 53, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36625, 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, true); +insert into sys.args values (36626, 54, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36627, 54, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36628, 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, true); -insert into sys.args values (36611, 55, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36612, 55, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36613, 55, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (56, 'mbr_distance', 'mbrDistance', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36614, 56, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (36615, 56, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36616, 56, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36629, 55, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36630, 55, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36631, 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, true); +insert into sys.args values (36632, 56, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36633, 56, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36634, 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, true); -insert into sys.args values (36617, 57, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (36618, 57, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36619, 57, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (58, 'left_shift', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36620, 58, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36621, 58, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36622, 58, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36635, 57, 'res_0', 'double', 53, 0, 0, 0); +insert into sys.args values (36636, 57, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36637, 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, true); +insert into sys.args values (36638, 58, 'res_0', 'double', 53, 0, 0, 0); +insert into sys.args values (36639, 58, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36640, 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, true); -insert into sys.args values (36623, 59, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36624, 59, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36625, 59, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (60, 'right_shift', 'mbrRight', 'geom', 0, 1, false, false, false, 2000, true, true); -insert into sys.args values (36626, 60, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36627, 60, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (36628, 60, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (36641, 59, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36642, 59, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (36643, 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, true); +insert into sys.args values (36644, 60, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (36645, 60, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (36646, 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, true); -insert into sys.args values (36629, 61, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (36630, 61, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (36631, 61, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (62, 'grouping', '', '', 0, 3, false, false, false, 2000, true, true); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
