Changeset: 31ad840bcbf5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/31ad840bcbf5
Modified Files:
testing/sqllogictest.py
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (111 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -834,3 +834,4 @@ ae474f7fda0a3f2ebefc6c0b2cd969ef0854fad1
dce400b68239412b1835fb28bd183bf50f5e8692 Aug2024_3
dce400b68239412b1835fb28bd183bf50f5e8692 Aug2024_release
ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_5
+ab5d60be21cd1c65e9de476d71a86c2995f70785 Aug2024_SP1_release
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
@@ -101198,7 +101198,7 @@ CREATE TABLE "testschema"."nulls_not_dis
CONSTRAINT "nulls_not_distinct_id_pkey" PRIMARY KEY ("id"),
CONSTRAINT "nulls_not_distinct_unique1_unique" UNIQUE ("unique1"),
CONSTRAINT "nulls_not_distinct_unique2_nndunique" UNIQUE NULLS NOT
DISTINCT ("unique2"),
- CONSTRAINT "nulls_not_distinct_check1_check" CHECK ("check1" > 0)
+ CONSTRAINT "nulls_not_distinct_check1_check" CHECK (check1 > 0)
);
COPY 1 RECORDS INTO "testschema"."nulls_not_distinct" FROM stdin USING
DELIMITERS E'\t',E'\n','"';
1 1 1 1
@@ -101344,6 +101344,18 @@ 7 "another"
9 "to"
9 "pass"
8 "attempt"
+CREATE MERGE TABLE "testschema"."testme_exp" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE USING ("sys"."md5"("a"));
+CREATE TABLE "testschema"."subtable_exp1" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable_exp2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
@@ -101459,6 +101471,8 @@ ALTER TABLE "testschema"."testme3" ADD T
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits1" AS PARTITION IN ('1', '2', '3');
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits2" AS PARTITION IN ('4', '5', '6') WITH NULL VALUES;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits3" AS PARTITION IN ('7', '8', '9');
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp1"
AS PARTITION FROM '00000000000000000000000000000000' TO
'7fffffffffffffffffffffffffffffff';
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp2"
AS PARTITION FROM '80000000000000000000000000000000' TO
'ffffffffffffffffffffffffffffffff';
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."t4";
ALTER TABLE "testschema"."mt2" ADD TABLE "testschema"."t1";
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101198,7 +101198,7 @@ CREATE TABLE "testschema"."nulls_not_dis
CONSTRAINT "nulls_not_distinct_id_pkey" PRIMARY KEY ("id"),
CONSTRAINT "nulls_not_distinct_unique1_unique" UNIQUE ("unique1"),
CONSTRAINT "nulls_not_distinct_unique2_nndunique" UNIQUE NULLS NOT
DISTINCT ("unique2"),
- CONSTRAINT "nulls_not_distinct_check1_check" CHECK ("check1" > 0)
+ CONSTRAINT "nulls_not_distinct_check1_check" CHECK (check1 > 0)
);
COPY 1 RECORDS INTO "testschema"."nulls_not_distinct" FROM stdin USING
DELIMITERS E'\t',E'\n','"';
1 1 1 1
@@ -101344,6 +101344,18 @@ 7 "another"
9 "to"
9 "pass"
8 "attempt"
+CREATE MERGE TABLE "testschema"."testme_exp" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE USING ("sys"."md5"("a"));
+CREATE TABLE "testschema"."subtable_exp1" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable_exp2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
@@ -101459,6 +101471,8 @@ ALTER TABLE "testschema"."testme3" ADD T
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits1" AS PARTITION IN ('1', '2', '3');
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits2" AS PARTITION IN ('4', '5', '6') WITH NULL VALUES;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits3" AS PARTITION IN ('7', '8', '9');
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp1"
AS PARTITION FROM '00000000000000000000000000000000' TO
'7fffffffffffffffffffffffffffffff';
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp2"
AS PARTITION FROM '80000000000000000000000000000000' TO
'ffffffffffffffffffffffffffffffff';
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."t4";
ALTER TABLE "testschema"."mt2" ADD TABLE "testschema"."t1";
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -61,6 +61,9 @@ geosre = re.compile(r'MULTIPOINT *\((?P<
ptsre = re.compile(r'-?\d+(?:\.\d+)? -?\d+(?:\.\d+)?')
geoszre = re.compile(r'MULTIPOINT *Z *\((?P<points>[^()]*)\)')
ptszre = re.compile(r'-?\d+(?:\.\d+)? -?\d+(?:\.\d+)? -?\d+(?:\.\d+)?')
+# geos 3.13 introduced parentheses around EMPTY in MULTIPOLYGON (but not
+# in all cases)
+geosere = re.compile(r'MULTIPOLYGON \(EMPTY\)')
architecture = platform.machine()
if architecture == 'AMD64': # Windows :-(
@@ -461,6 +464,9 @@ class SQLLogic:
if res is not None:
points = ptszre.sub(r'(\g<0>)', res.group('points'))
col = col[:res.start('points')] + points +
col[res.end('points'):]
+ res = geosere.search(col)
+ if res is not None:
+ col = col[:res.start(0)] + 'MULTIPOLYGON EMPTY' +
col[res.end(0):]
nrow.append(col)
ndata.append(nrow)
data = ndata
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
