Changeset: 95ebd98e1602 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/95ebd98e1602
Added Files:
sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.SQL.py.src
sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.reqtests
sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.stable.out.int128.src
sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.timeout
sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-chain/Tests/All
sql/test/emptydb-previous-upgrade-chain/Tests/check.SQL.py.src
sql/test/emptydb-previous-upgrade-chain/Tests/check.reqtests
sql/test/emptydb-previous-upgrade-chain/Tests/check.stable.out.32bit.src
sql/test/emptydb-previous-upgrade-chain/Tests/check.stable.out.int128.src
sql/test/emptydb-previous-upgrade-chain/Tests/check.stable.out.src
sql/test/emptydb-previous-upgrade-chain/Tests/check.timeout
sql/test/emptydb-previous-upgrade-chain/Tests/package.py
sql/test/emptydb-previous-upgrade-chain/Tests/package.reqtests
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-hge/Tests/All
sql/test/emptydb-previous-upgrade-hge/Tests/check.SQL.py.src
sql/test/emptydb-previous-upgrade-hge/Tests/check.reqtests
sql/test/emptydb-previous-upgrade-hge/Tests/check.stable.out.int128.src
sql/test/emptydb-previous-upgrade-hge/Tests/check.timeout
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/All
sql/test/emptydb-previous-upgrade/Tests/check.SQL.py.src
sql/test/emptydb-previous-upgrade/Tests/check.reqtests
sql/test/emptydb-previous-upgrade/Tests/check.stable.out.32bit.src
sql/test/emptydb-previous-upgrade/Tests/check.stable.out.int128.src
sql/test/emptydb-previous-upgrade/Tests/check.stable.out.src
sql/test/emptydb-previous-upgrade/Tests/check.timeout
sql/test/emptydb-previous-upgrade/Tests/upgrade.py
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/All
sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.SQL.py.src
sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.reqtests
sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.timeout
sql/test/testdb-previous-upgrade-chain-hge/Tests/package.py
sql/test/testdb-previous-upgrade-chain-hge/Tests/package.reqtests
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/All
sql/test/testdb-previous-upgrade-chain/Tests/dump.SQL.py.src
sql/test/testdb-previous-upgrade-chain/Tests/dump.reqtests
sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/dump.timeout
sql/test/testdb-previous-upgrade-chain/Tests/package.py
sql/test/testdb-previous-upgrade-chain/Tests/package.reqtests
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.py
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/All
sql/test/testdb-previous-upgrade-hge/Tests/dump.SQL.py.src
sql/test/testdb-previous-upgrade-hge/Tests/dump.reqtests
sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-hge/Tests/dump.timeout
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.py
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/All
sql/test/testdb-previous-upgrade/Tests/dump.SQL.py.src
sql/test/testdb-previous-upgrade/Tests/dump.reqtests
sql/test/testdb-previous-upgrade/Tests/dump.stable.out
sql/test/testdb-previous-upgrade/Tests/dump.timeout
sql/test/testdb-previous-upgrade/Tests/upgrade.py
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/package.py
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py
sql/test/emptydb-upgrade-chain/Tests/All
sql/test/emptydb-upgrade-chain/Tests/package.py
sql/test/emptydb-upgrade-chain/Tests/upgrade.py
sql/test/emptydb-upgrade-hge/Tests/All
sql/test/emptydb-upgrade-hge/Tests/upgrade.py
sql/test/emptydb-upgrade/Tests/All
sql/test/emptydb-upgrade/Tests/upgrade.py
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb-upgrade-chain/Tests/upgrade.py
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/upgrade.py
sql/test/testdb-upgrade/Tests/All
sql/test/testdb-upgrade/Tests/upgrade.py
testing/Mconvert.py.in
testing/Mtest.py.in
testing/Mz.py.in
Branch: Jul2021
Log Message:
In addition to the last release, also test upgrade from previous feature
release.
diffs (truncated from 499095 to 300 lines):
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/All
@@ -0,0 +1,3 @@
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_NETCDF&HAVE_SHP&PREVHGECHAINRELEMPTY&!NOWAL?upgrade
+RELEASERUN?package
+KNOWNFAIL?check
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.SQL.py.src
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/check.SQL.py
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.reqtests
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.reqtests
@@ -0,0 +1,1 @@
+upgrade
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.stable.out.int128.src
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.stable.out.int128.src
new file mode 100644
--- /dev/null
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.stable.out.int128.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../emptydb/Tests/check.stable.out.int128
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.timeout
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/check.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.py
@@ -0,0 +1,49 @@
+import os, sys, zipfile
+
+dbfarm = os.environ['GDK_DBFARM']
+db = os.path.join(dbfarm, os.environ['TSTDB'])
+archive = os.path.join(dbfarm, 'prevhgechainrelempty.zip')
+rev = os.getenv('REVISION')
+
+if not os.path.exists(db):
+ print('database directory %s does not exist' % db, file=sys.stderr)
+ sys.exit(1)
+
+try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'SUBCOMMIT', 'BBP.dir'), 'r')
+except IOError:
+ try:
+ f = open(os.path.join(db, 'bat', 'BACKUP', 'BBP.dir'), 'r')
+ except IOError:
+ f = open(os.path.join(db, 'bat', 'BBP.dir'), 'r')
+hdr = f.readline()
+ptroid = f.readline()
+ptr, oid, hge = ptroid.split()
+f.close()
+
+z = zipfile.ZipFile(archive)
+comment = z.comment
+z.close()
+
+try:
+ # try to create compressed zip file
+ z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrelempty.zip'), 'w',
+ zipfile.ZIP_DEFLATED)
+except RuntimeError:
+ # if that fails, create uncompressed zip file
+ z = zipfile.ZipFile(os.path.join(dbfarm, 'newhgechainrelempty.zip'), 'w')
+
+if rev:
+ revcomment = ' (hg id %s)' % rev
+else:
+ revcomment = ''
+if hge == '16' and b'largest integer size 16' not in comment:
+ revcomment = ' with largest integer size 16' + revcomment
+z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME',
'unknown'), revcomment)).encode('utf-8')
+
+for root, dirs, files in os.walk(db):
+ for f in files:
+ ff = os.path.join(root, f)
+ z.write(ff, ff[len(db) + len(os.sep):].replace(os.sep, '/'))
+
+z.close()
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/package.reqtests
@@ -0,0 +1,1 @@
+upgrade
diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
new file mode 100644
--- /dev/null
+++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python3
+
+# When called in the test environment, this is called with exactly one
+# argument: the name of the test.
+# When called without argument, we dump the server output so that it
+# can be saved to be tested against.
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+import sys, os, zipfile, platform
+
+xit = 0
+
+# find zipped database
+dbfarm = os.environ['GDK_DBFARM']
+db = os.path.join(dbfarm, os.environ['TSTDB'])
+archive = os.path.join(dbfarm, 'prevhgechainrelempty.zip')
+if not os.path.exists(archive):
+ print('file "{}" not found'.format(archive), file=sys.stderr)
+ sys.exit(1)
+
+# unpackage database
+with zipfile.ZipFile(archive) as z:
+ z.extractall(path=db)
+
+# start server and dump database
+with process.server(mapiport='0',
+ stdin=process.PIPE,
+ stdout=process.PIPE,
+ stderr=process.PIPE) as srv:
+ with process.client(lang='sqldump',
+ stdin=process.PIPE,
+ stdout=process.PIPE,
+ stderr=process.PIPE,
+ server=srv) as clt:
+ cltout, clterr = clt.communicate()
+ srvout, srverr = srv.communicate()
+
+srvout = [line for line in srvout.splitlines(keepends=True) if not
line.startswith('#')]
+cltout = [line for line in cltout.splitlines(keepends=False) if not
line.startswith('--')]
+
+# check server output (upgrade commands) and check dump (empty)
+if len(sys.argv) == 2 and sys.argv[1] == 'upgrade':
+ bits = os.getenv('TST_BITS')
+ if bits:
+ bits = ['.' + bits, '']
+ else:
+ bits = ['']
+ arch = platform.machine()
+ arch = ['.' + arch, '']
+ hge = os.getenv('HAVE_HGE')
+ if hge:
+ hge = ['.int128', '']
+ else:
+ hge = ['']
+ found = False
+ for b in bits:
+ for a in arch:
+ for h in hge:
+ f = 'upgrade.stable.out{}{}{}'.format(b, a, h)
+ found = os.path.exists(f)
+ if found:
+ break
+ if found:
+ break
+ if found:
+ break
+ stable = open(f).readlines()
+ import difflib
+ for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
+ sys.stderr.write(line)
+ xit = 1
+ if len(cltout) != 2 or cltout[0] != 'START TRANSACTION;' or cltout[1] !=
'COMMIT;':
+ sys.stderr.write('\n'.join(cltout))
+ xit = 1
+else:
+ sys.stdout.writelines(srvout)
+
+sys.exit(xit)
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -0,0 +1,5116 @@
+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 (1, 'void', 'any', 0, 0, 0, 0, 2000);
+insert into sys.types values (2, 'bat', 'table', 0, 0, 0, 1, 2000);
+insert into sys.types values (3, 'ptr', 'ptr', 0, 0, 0, 1, 2000);
+insert into sys.types values (4, 'bit', 'boolean', 1, 0, 2, 2, 2000);
+insert into sys.types values (5, 'str', 'clob', 0, 0, 0, 4, 2000);
+insert into sys.types values (6, 'str', 'varchar', 0, 0, 0, 4, 2000);
+insert into sys.types values (7, 'str', 'char', 0, 0, 0, 3, 2000);
+insert into sys.types values (8, 'oid', 'oid', 63, 0, 2, 6, 2000);
+insert into sys.types values (9, 'bte', 'tinyint', 8, 1, 2, 7, 2000);
+insert into sys.types values (10, 'sht', 'smallint', 16, 1, 2, 7, 2000);
+insert into sys.types values (11, 'int', 'int', 32, 1, 2, 7, 2000);
+insert into sys.types values (12, 'lng', 'bigint', 64, 1, 2, 7, 2000);
+insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
+insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000);
+insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000);
+insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000);
+insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000);
+insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000);
+insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000);
+insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000);
+insert into sys.types values (21, 'int', 'month_interval', 3, 0, 10, 8, 2000);
+insert into sys.types values (22, 'lng', 'day_interval', 4, 0, 10, 9, 2000);
+insert into sys.types values (23, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
+insert into sys.types values (24, 'daytime', 'time', 7, 0, 0, 12, 2000);
+insert into sys.types values (25, 'daytime', 'timetz', 7, 1, 0, 13, 2000);
+insert into sys.types values (26, 'date', 'date', 0, 0, 0, 14, 2000);
+insert into sys.types values (27, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000);
+insert into sys.types values (28, 'timestamp', 'timestamptz', 7, 1, 0, 16,
2000);
+insert into sys.types values (29, 'blob', 'blob', 0, 0, 0, 5, 2000);
+insert into sys.types values (32, 'wkb', 'geometry', 0, 0, 0, 17, 2000);
+insert into sys.types values (33, 'wkba', 'geometrya', 0, 0, 0, 18, 2000);
+insert into sys.types values (34, 'mbr', 'mbr', 0, 0, 0, 18, 2000);
+delete from sys.functions where id < 2000;
+delete from sys.args where func_id not in (select id from sys.functions);
+insert into sys.functions values (30, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
+insert into sys.args values (41396, 30, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (41397, 30, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.functions values (31, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
+insert into sys.args values (41398, 31, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (41399, 31, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.functions values (35, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
+insert into sys.args values (41400, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41401, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41402, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (36, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
+insert into sys.args values (41403, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41404, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41405, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (37, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41406, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41407, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41408, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (38, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41409, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41410, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41411, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (39, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41412, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41413, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41414, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (40, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41415, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41416, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41417, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (41, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41418, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41419, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41420, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (42, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41421, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41422, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41423, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (43, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41424, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41425, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41426, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (44, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
+insert into sys.args values (41427, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41428, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41429, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (45, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41430, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41431, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41432, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (46, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41433, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41434, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41435, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (47, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41436, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41437, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41438, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (48, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41439, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41440, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41441, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (49, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41442, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41443, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41444, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (50, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41445, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41446, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41447, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (51, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41448, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41449, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (41450, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.functions values (52, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
+insert into sys.args values (41451, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (41452, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (41453, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (53, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
