Changeset: 3a5a47b9c055 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3a5a47b9c055
Modified Files:
        geom/sql/pg_regression/Tests/dump.test
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (39 lines):

diff --git a/geom/sql/pg_regression/Tests/All b/geom/sql/pg_regression/Tests/All
--- a/geom/sql/pg_regression/Tests/All
+++ b/geom/sql/pg_regression/Tests/All
@@ -83,7 +83,7 @@ HAVE_GEOM?regress_ogc_cover
 
 #HAVE_GEOM?regress_management #Functions not applicable in MOnetDB
 
-HAVE_GEOM?dump #Unknown Types: TRIANGLE, TIN (queries for those types 
commented out)
+HAVE_GEOM&GEOS_VERSION>=3.10?dump #Unknown Types: TRIANGLE, TIN (queries for 
those types commented out)
 
 HAVE_GEOM?dumppoints #Uknown Types: TRIANGLE, TIN, CURVEPOLYGON (queries for 
these types commented out)
 
diff --git a/geom/sql/pg_regression/Tests/dump.test 
b/geom/sql/pg_regression/Tests/dump.test
--- a/geom/sql/pg_regression/Tests/dump.test
+++ b/geom/sql/pg_regression/Tests/dump.test
@@ -89,10 +89,12 @@ FROM ST_Dump(ST_WKTToSQL('
                MULTILINESTRING EMPTY,
                MULTIPOLYGON EMPTY,
                GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY))'))
-WHERE id <> '7' OFFSET 1 -- avoid difference between geos libraries < 3.10 vs. 
>= 3.10
 ----
 t11
 1
+GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY, LINESTRING EMPTY, POLYGON EMPTY, 
MULTIPOINT EMPTY, MULTILINESTRING EMPTY, MULTIPOLYGON EMPTY, GEOMETRYCOLLECTION 
(GEOMETRYCOLLECTION EMPTY))
+t11
+1
 GEOMETRYCOLLECTION EMPTY
 t11
 2
@@ -110,6 +112,9 @@ t11
 6
 MULTIPOLYGON EMPTY
 t11
+7
+GEOMETRYCOLLECTION (GEOMETRYCOLLECTION EMPTY)
+t11
 7,1
 GEOMETRYCOLLECTION EMPTY
 
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to