Changeset: 9476815fdb6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9476815fdb6a
Added Files:
geom/sql/functions/Tests/ST_AsEWKT-3.12.reqtests
geom/sql/functions/Tests/ST_AsEWKT-3.12.test
geom/sql/functions/Tests/ST_AsText-3.12.reqtests
geom/sql/functions/Tests/ST_AsText-3.12.test
geom/sql/functions/Tests/ST_Boundary-3.12.reqtests
geom/sql/functions/Tests/ST_Boundary-3.12.test
geom/sql/functions/Tests/ST_Contains-3.12.reqtests
geom/sql/functions/Tests/ST_Contains-3.12.test
geom/sql/functions/Tests/ST_CoordDim-3.12.reqtests
geom/sql/functions/Tests/ST_CoordDim-3.12.test
geom/sql/functions/Tests/ST_GeomFromText-3.12.reqtests
geom/sql/functions/Tests/ST_GeomFromText-3.12.test
geom/sql/functions/Tests/ST_GeometryN-3.12.reqtests
geom/sql/functions/Tests/ST_GeometryN-3.12.test
geom/sql/functions/Tests/ST_GeometryType-3.12.reqtests
geom/sql/functions/Tests/ST_GeometryType-3.12.test
geom/sql/functions/Tests/ST_IsClosed-3.12.reqtests
geom/sql/functions/Tests/ST_IsClosed-3.12.test
geom/sql/functions/Tests/ST_IsSimple-3.12.reqtests
geom/sql/functions/Tests/ST_IsSimple-3.12.test
geom/sql/functions/Tests/ST_IsValid-3.12.reqtests
geom/sql/functions/Tests/ST_IsValid-3.12.test
geom/sql/functions/Tests/ST_MPointFromText-3.12.reqtests
geom/sql/functions/Tests/ST_MPointFromText-3.12.test
geom/sql/functions/Tests/ST_NRings-3.12.reqtests
geom/sql/functions/Tests/ST_NRings-3.12.test
geom/sql/functions/Tests/ST_NumInteriorRings-3.12.reqtests
geom/sql/functions/Tests/ST_NumInteriorRings-3.12.test
geom/sql/pg_regression/Tests/boundary-3.12.test
Modified Files:
geom/sql/functions/Tests/All
geom/sql/pg_regression/Tests/All
sql/test/testdb-previous-upgrade-chain-hge/Tests/All
sql/test/testdb-previous-upgrade-chain/Tests/All
sql/test/testdb-previous-upgrade-hge/Tests/All
sql/test/testdb-previous-upgrade/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade/Tests/All
sql/test/testdb/Tests/All
Branch: Jun2023
Log Message:
Deal with version 3.12 of the geos library.
diffs (truncated from 2132 to 300 lines):
diff --git a/geom/sql/functions/Tests/All b/geom/sql/functions/Tests/All
--- a/geom/sql/functions/Tests/All
+++ b/geom/sql/functions/Tests/All
@@ -3,10 +3,12 @@ HAVE_GEOM?loadTestWKT
HAVE_GEOM?ST_PointFromText
HAVE_GEOM?ST_LineFromText
HAVE_GEOM?ST_PolygonFromText
-HAVE_GEOM?ST_MPointFromText
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_MPointFromText
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_MPointFromText-3.12
HAVE_GEOM?ST_MLineFromText
HAVE_GEOM?ST_MPolygonFromText
-HAVE_GEOM?ST_GeomFromText
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_GeomFromText
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_GeomFromText-3.12
HAVE_GEOM?dropTestWKT
@@ -15,38 +17,50 @@ HAVE_GEOM?ST_MakePoint
HAVE_GEOM?loadTestGeometries
-HAVE_GEOM?ST_GeometryType
-HAVE_GEOM?ST_AsText
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_GeometryType
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_GeometryType-3.12
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_AsText
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_AsText-3.12
-HAVE_GEOM?ST_IsClosed
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_IsClosed
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_IsClosed-3.12
HAVE_GEOM?ST_IsEmpty
-HAVE_GEOM&GEOS_VERSION>=3.8?ST_IsSimple
-HAVE_GEOM?ST_IsValid
+HAVE_GEOM&GEOS_VERSION>=3.8&!GEOS_VERSION>=3.12.0?ST_IsSimple
+HAVE_GEOM&GEOS_VERSION>=3.8&GEOS_VERSION>=3.12.0?ST_IsSimple-3.12
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_IsValid
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_IsValid-3.12
HAVE_GEOM?ST_IsRing
HAVE_GEOM?XYZ
HAVE_GEOM?XYZMinMax
#HAVE_GEOM?srid
-HAVE_GEOM?ST_GeometryN
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_GeometryN
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_GeometryN-3.12
HAVE_GEOM?ST_NumGeometries
HAVE_GEOM?ST_NumPoints
HAVE_GEOM?ST_NPoints
-HAVE_GEOM?ST_NumInteriorRings
-HAVE_GEOM?ST_NRings
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_NumInteriorRings
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_NumInteriorRings-3.12
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_NRings
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_NRings-3.12
#HAVE_GEOM?transform
-HAVE_GEOM?ST_Contains
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_Contains
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_Contains-3.12
#HAVE_GEOM?equals
-HAVE_GEOM&GEOS_VERSION>=3.11.1?ST_Boundary
+HAVE_GEOM&GEOS_VERSION>=3.11.1&!GEOS_VERSION>=3.12.0?ST_Boundary
+HAVE_GEOM&GEOS_VERSION>=3.11.1&GEOS_VERSION>=3.12.0?ST_Boundary-3.12
HAVE_GEOM?ST_Dimension
-HAVE_GEOM?ST_CoordDim
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_CoordDim
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_CoordDim-3.12
-HAVE_GEOM?ST_AsEWKT
+HAVE_GEOM&!GEOS_VERSION>=3.12.0?ST_AsEWKT
+HAVE_GEOM&GEOS_VERSION>=3.12.0?ST_AsEWKT-3.12
#HAVE_GEOM?ST_Covers #Look at ST_Covers.sql for more details on the problem
#HAVE_GEOM?ST_CoveredBy #Look at ST_CoveredBy.sql for more details on the
problem
diff --git a/geom/sql/functions/Tests/ST_AsEWKT-3.12.reqtests
b/geom/sql/functions/Tests/ST_AsEWKT-3.12.reqtests
new file mode 100644
--- /dev/null
+++ b/geom/sql/functions/Tests/ST_AsEWKT-3.12.reqtests
@@ -0,0 +1,1 @@
+loadTestGeometries
diff --git a/geom/sql/functions/Tests/ST_AsEWKT-3.12.test
b/geom/sql/functions/Tests/ST_AsEWKT-3.12.test
new file mode 100644
--- /dev/null
+++ b/geom/sql/functions/Tests/ST_AsEWKT-3.12.test
@@ -0,0 +1,219 @@
+query T rowsort
+select st_asEWKT(st_pointfromtext('point(10 10)'))
+----
+SRID:0;POINT (10 10)
+
+query T rowsort
+select st_asEWKT(st_pointfromtext('point(20 20)', 4326))
+----
+SRID:4326;POINT (20 20)
+
+query T rowsort
+select st_asEWKT(st_pointfromtext('point(10 10 10)'))
+----
+SRID:0;POINT Z (10 10 10)
+
+query T rowsort
+select st_asEWKT(st_makepoint(10, 10))
+----
+SRID:0;POINT (10 10)
+
+query T rowsort
+select st_asEWKT(st_point(20, 20))
+----
+SRID:0;POINT (20 20)
+
+query T rowsort
+select st_asEWKT(st_makepoint(10, 10, 10))
+----
+SRID:0;POINT Z (10 10 10)
+
+query T rowsort
+select st_asEWKT(st_linefromtext('linestring(10 10, 20 20, 30 30)'))
+----
+SRID:0;LINESTRING (10 10, 20 20, 30 30)
+
+query T rowsort
+select st_asEWKT(st_linefromtext('linestring(20 20, 30 30, 40 40)', 4326))
+----
+SRID:4326;LINESTRING (20 20, 30 30, 40 40)
+
+query T rowsort
+select st_asEWKT(st_linefromtext('linestring(20 20 20, 30 30 30, 40 40 40)',
4326))
+----
+SRID:4326;LINESTRING Z (20 20 20, 30 30 30, 40 40 40)
+
+query T rowsort
+select st_asEWKT(st_polygonfromtext('polygon((10 10, 20 20, 30 30, 10 10))'))
+----
+SRID:0;POLYGON ((10 10, 20 20, 30 30, 10 10))
+
+query T rowsort
+select st_asEWKT(st_polygonfromtext('polygon((20 20, 30 30, 40 40, 20 20))',
4326))
+----
+SRID:4326;POLYGON ((20 20, 30 30, 40 40, 20 20))
+
+query T rowsort
+select st_asEWKT(st_polygonfromtext('polygon((10 10 10, 20 20 20, 30 30 30, 10
10 10))'))
+----
+SRID:0;POLYGON Z ((10 10 10, 20 20 20, 30 30 30, 10 10 10))
+
+query T rowsort
+select st_asEWKT(st_mpointfromtext('multipoint(10 10, 20 20)'))
+----
+SRID:0;MULTIPOINT ((10 10), (20 20))
+
+query T rowsort
+select st_asEWKT(st_mpointfromtext('multipoint(20 20, 30 30)', 4326))
+----
+SRID:4326;MULTIPOINT ((20 20), (30 30))
+
+query T rowsort
+select st_asEWKT(st_mpointfromtext('multipoint(20 20 20, 30 30 30)', 4326))
+----
+SRID:4326;MULTIPOINT Z ((20 20 20), (30 30 30))
+
+query T rowsort
+select st_asEWKT(st_mlinefromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
+----
+SRID:0;MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
+
+query T rowsort
+select st_asEWKT(st_mlinefromtext('multilinestring((20 20, 30 30, 40 40), (50
50, 60 60, 70 70))', 4326))
+----
+SRID:4326;MULTILINESTRING ((20 20, 30 30, 40 40), (50 50, 60 60, 70 70))
+
+query T rowsort
+select st_asEWKT(st_mlinefromtext('multilinestring((20 20 20, 30 30 30, 40 40
40), (50 50 50, 60 60 60, 70 70 70))', 4326))
+----
+SRID:4326;MULTILINESTRING Z ((20 20 20, 30 30 30, 40 40 40), (50 50 50, 60 60
60, 70 70 70))
+
+query T rowsort
+select st_asEWKT(st_mpolyfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
+----
+SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300
300, 100 100)))
+
+query T rowsort
+select st_asEWKT(st_mpolyfromtext('multipolygon(((20 20, 30 30, 40 40, 20
20),(200 200, 300 300, 400 400, 200 200)))', 4326))
+----
+SRID:4326;MULTIPOLYGON (((20 20, 30 30, 40 40, 20 20), (200 200, 300 300, 400
400, 200 200)))
+
+query T rowsort
+select st_asEWKT(st_mpolyfromtext('multipolygon(((10 10 10, 20 20 20, 30 30
30, 10 10 10),(100 100 100, 200 200 200, 300 300 300, 100 100 100)))'))
+----
+SRID:0;MULTIPOLYGON Z (((10 10 10, 20 20 20, 30 30 30, 10 10 10), (100 100
100, 200 200 200, 300 300 300, 100 100 100)))
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('point(10 10)'))
+----
+SRID:0;POINT (10 10)
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('linestring(10 10, 20 20, 30 30)'))
+----
+SRID:0;LINESTRING (10 10, 20 20, 30 30)
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('polygon((10 10, 20 20, 30 30, 10 10))'))
+----
+SRID:0;POLYGON ((10 10, 20 20, 30 30, 10 10))
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('multipoint(10 10, 20 20)'))
+----
+SRID:0;MULTIPOINT ((10 10), (20 20))
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
+----
+SRID:0;MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
+
+query T rowsort
+select st_asEWKT(st_geomfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
+----
+SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300
300, 100 100)))
+
+statement ok
+create table points_tbl(g geometry(point))
+
+statement ok
+insert into points_tbl values (st_pointfromtext('point(10 10)'))
+
+query T rowsort
+select st_asEWKT(g) from points_tbl
+----
+SRID:0;POINT (10 10)
+
+statement ok
+drop table points_tbl
+
+statement ok
+create table lines_tbl(g geometry(linestring))
+
+statement ok
+insert into lines_tbl values (st_linefromtext('linestring(10 10, 20 20, 30
30)'))
+
+query T rowsort
+select st_asEWKT(g) from lines_tbl
+----
+SRID:0;LINESTRING (10 10, 20 20, 30 30)
+
+statement ok
+drop table lines_tbl
+
+statement ok
+create table polygons_tbl(g geometry(polygon))
+
+statement ok
+insert into polygons_tbl values (st_polygonfromtext('polygon((10 10, 20 20, 30
30, 10 10))'))
+
+query T rowsort
+select st_asEWKT(g) from polygons_tbl
+----
+SRID:0;POLYGON ((10 10, 20 20, 30 30, 10 10))
+
+statement ok
+drop table polygons_tbl
+
+statement ok
+create table points_tbl(g geometry(pointz))
+
+statement ok
+insert into points_tbl values (st_pointfromtext('point(10 10 10)'))
+
+query T rowsort
+select st_asEWKT(g) from points_tbl
+----
+SRID:0;POINT Z (10 10 10)
+
+statement ok
+drop table points_tbl
+
+statement ok
+create table lines_tbl(g geometry(linestringz))
+
+statement ok
+insert into lines_tbl values (st_linefromtext('linestring(10 10 10, 20 20 20,
30 30 30)'))
+
+query T rowsort
+select st_asEWKT(g) from lines_tbl
+----
+SRID:0;LINESTRING Z (10 10 10, 20 20 20, 30 30 30)
+
+statement ok
+drop table lines_tbl
+
+statement ok
+create table polygons_tbl(g geometry(polygonz))
+
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
