Changeset: 09a6400c6f45 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/09a6400c6f45
Modified Files:
sql/test/testdb-previous-upgrade-chain-hge/Tests/All
sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/All
sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-hge/Tests/All
sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade/Tests/All
sql/test/testdb-previous-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/All
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb/Tests/All
sql/test/testdb/Tests/dump.SQL.py
sql/test/testdb/Tests/dump.stable.out
Branch: Dec2023
Log Message:
Also dump with geos 3.12: we fix up the old dump output to look like the new.
diffs (205 lines):
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/All
@@ -1,2 +1,2 @@
HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out
@@ -101206,7 +101206,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/All
b/sql/test/testdb-previous-upgrade-chain/Tests/All
--- a/sql/test/testdb-previous-upgrade-chain/Tests/All
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/All
@@ -1,2 +1,2 @@
HAVE_GEOM&PREVCHAINREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out
@@ -101206,7 +101206,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-previous-upgrade-hge/Tests/All
b/sql/test/testdb-previous-upgrade-hge/Tests/All
--- a/sql/test/testdb-previous-upgrade-hge/Tests/All
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/All
@@ -1,2 +1,2 @@
HAVE_HGE&HAVE_GEOM&PREVHGEREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
@@ -101347,7 +101347,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
diff --git a/sql/test/testdb-previous-upgrade/Tests/All
b/sql/test/testdb-previous-upgrade/Tests/All
--- a/sql/test/testdb-previous-upgrade/Tests/All
+++ b/sql/test/testdb-previous-upgrade/Tests/All
@@ -1,2 +1,2 @@
HAVE_GEOM&PREVREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
@@ -101347,7 +101347,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/All
b/sql/test/testdb-upgrade-chain-hge/Tests/All
--- a/sql/test/testdb-upgrade-chain-hge/Tests/All
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/All
@@ -1,3 +1,3 @@
HAVE_HGE&HAVE_GEOM&LASTHGECHAINREL&!NOWAL?upgrade
RELEASERUN?package
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
@@ -101206,7 +101206,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-upgrade-chain/Tests/All
b/sql/test/testdb-upgrade-chain/Tests/All
--- a/sql/test/testdb-upgrade-chain/Tests/All
+++ b/sql/test/testdb-upgrade-chain/Tests/All
@@ -1,3 +1,3 @@
HAVE_GEOM&LASTCHAINREL&!NOWAL?upgrade
RELEASERUN&!HAVE_HGE?package
-!GEOS_VERSION>=3.12?dump
+dump
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
@@ -101206,7 +101206,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
create view keytest3 as select t2.key1, t2.key2, t1.key3 from keytest1 t1,
keytest2 t2 where t1.key1 = t2.key1 and t1.key2 = t2.key2;
create trigger keytesttrigger after update on keytest1 referencing new row as
new_row for each row insert into keytest2 values (new_row.key1, new_row.key2);
diff --git a/sql/test/testdb-upgrade-hge/Tests/All
b/sql/test/testdb-upgrade-hge/Tests/All
--- a/sql/test/testdb-upgrade-hge/Tests/All
+++ b/sql/test/testdb-upgrade-hge/Tests/All
@@ -1,2 +1,2 @@
HAVE_HGE&HAVE_GEOM&LASTHGEREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
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
@@ -101347,7 +101347,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
diff --git a/sql/test/testdb-upgrade/Tests/All
b/sql/test/testdb-upgrade/Tests/All
--- a/sql/test/testdb-upgrade/Tests/All
+++ b/sql/test/testdb-upgrade/Tests/All
@@ -1,2 +1,2 @@
HAVE_GEOM&LASTREL&!NOWAL?upgrade
-!GEOS_VERSION>=3.12?dump
+dump
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
@@ -101347,7 +101347,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
diff --git a/sql/test/testdb/Tests/All b/sql/test/testdb/Tests/All
--- a/sql/test/testdb/Tests/All
+++ b/sql/test/testdb/Tests/All
@@ -2,5 +2,5 @@ load
HAVE_GEOM?load-geom
!HAVE_HGE&HAVE_GEOM&RELEASERUN?package
HAVE_HGE&HAVE_GEOM&RELEASERUN?package-hge
-HAVE_GEOM&!GEOS_VERSION>=3.12?dump
+HAVE_GEOM?dump
!HAVE_GEOM?dump-nogeom
diff --git a/sql/test/testdb/Tests/dump.SQL.py
b/sql/test/testdb/Tests/dump.SQL.py
--- a/sql/test/testdb/Tests/dump.SQL.py
+++ b/sql/test/testdb/Tests/dump.SQL.py
@@ -5,6 +5,11 @@ try:
except ImportError:
import process
+# this stuff is for geos pre 3.12
+import re
+geosre = re.compile(r'MULTIPOINT *\((?P<points>[^()]*)\)')
+ptsre = re.compile(r'\d+ \d+')
+
with process.client('sqldump',
stdin=process.PIPE,
stdout=process.PIPE,
@@ -15,6 +20,13 @@ if len(sys.argv) == 2 and sys.argv[1] in
output = ''.join(out).splitlines(keepends=True)
while len(output) > 0 and output[0].startswith('--'):
del output[0]
+ # this for loop is for geos pre 3.12
+ for i in range(len(output)):
+ line = output[i]
+ res = geosre.search(line)
+ if res is not None:
+ points = ptsre.sub(r'(\g<0>)', res.group('points'))
+ output[i] = line[:res.start(0)] + f'MULTIPOINT ({points})' +
line[res.end(0):]
stableout = '{}.stable.out'.format(sys.argv[1])
stable = open(stableout, encoding='utf-8').readlines()
import difflib
diff --git a/sql/test/testdb/Tests/dump.stable.out
b/sql/test/testdb/Tests/dump.stable.out
--- a/sql/test/testdb/Tests/dump.stable.out
+++ b/sql/test/testdb/Tests/dump.stable.out
@@ -101347,7 +101347,7 @@ CREATE TABLE "testschema"."geomtest" (
"m" MBR
);
COPY 2 RECORDS INTO "testschema"."geomtest" FROM stdin USING DELIMITERS
E'\t',E'\n','"';
-POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT (20 80, 110 160, 20
160) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING ((0 0,
0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50 20, 140
110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON (((140
110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220 190,
300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
+POINT (10.5 12.3) LINESTRING (10 10, 20 20, 30 40) LINESTRING (10
10, 20 20, 30 40) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) MULTIPOINT ((20 80), (110 160),
(20 160)) MULTILINESTRING ((0 0, 0 80, 60 80, 60 0, 0 0)) MULTILINESTRING
((0 0, 0 80, 60 80, 60 0, 0 0)) MULTIPOLYGON (((140 110, 260 110, 170 20, 50
20, 140 110)), ((300 270, 420 270, 340 190, 220 190, 300 270))) MULTIPOLYGON
(((140 110, 260 110, 170 20, 50 20, 140 110)), ((300 270, 420 270, 340 190, 220
190, 300 270))) POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))
GEOMETRYCOLLECTION (POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0)), LINESTRING (10
10, 20 20, 30 40)) BOX (10.000000 10.000000, 20.000000 20.000000)
NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
NULL NULL NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
