Changeset: 801ff5abf37a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=801ff5abf37a
Modified Files:
geom/BugTracker/Tests/X_crash.SF-1971632.test
geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
geom/sql/conformance/Tests/T1.test
geom/sql/conformance/Tests/T10.test
geom/sql/conformance/Tests/T11.test
geom/sql/conformance/Tests/T12.test
geom/sql/conformance/Tests/T13.test
geom/sql/conformance/Tests/T14.test
geom/sql/conformance/Tests/T15.test
geom/sql/conformance/Tests/T16.test
geom/sql/conformance/Tests/T17.test
geom/sql/conformance/Tests/T18.test
geom/sql/conformance/Tests/T2.test
geom/sql/conformance/Tests/T21.test
geom/sql/conformance/Tests/T22.test
geom/sql/conformance/Tests/T23.test
geom/sql/conformance/Tests/T24.test
geom/sql/conformance/Tests/T25.test
geom/sql/conformance/Tests/T26.test
geom/sql/conformance/Tests/T27.test
geom/sql/conformance/Tests/T28.test
geom/sql/conformance/Tests/T29.test
geom/sql/conformance/Tests/T3.test
geom/sql/conformance/Tests/T30.test
geom/sql/conformance/Tests/T31.test
geom/sql/conformance/Tests/T32.test
geom/sql/conformance/Tests/T33.test
geom/sql/conformance/Tests/T34.test
geom/sql/conformance/Tests/T35.test
geom/sql/conformance/Tests/T36.test
geom/sql/conformance/Tests/T37.test
geom/sql/conformance/Tests/T38.test
geom/sql/conformance/Tests/T39.test
geom/sql/conformance/Tests/T4.test
geom/sql/conformance/Tests/T40.test
geom/sql/conformance/Tests/T41.test
geom/sql/conformance/Tests/T42.test
geom/sql/conformance/Tests/T43.test
geom/sql/conformance/Tests/T44.test
geom/sql/conformance/Tests/T45.test
geom/sql/conformance/Tests/T46.test
geom/sql/conformance/Tests/T47.test
geom/sql/conformance/Tests/T48.test
geom/sql/conformance/Tests/T49.test
geom/sql/conformance/Tests/T5.test
geom/sql/conformance/Tests/T50.test
geom/sql/conformance/Tests/T51.test
geom/sql/conformance/Tests/T52.test
geom/sql/conformance/Tests/T6.test
geom/sql/conformance/Tests/T7.test
geom/sql/conformance/Tests/T8.test
geom/sql/conformance/Tests/conformance_load.test
geom/sql/functions/Tests/ST_AsEWKT.test
geom/sql/functions/Tests/ST_AsText.test
geom/sql/functions/Tests/ST_Boundary.test
geom/sql/functions/Tests/ST_Contains.test
geom/sql/functions/Tests/ST_CoordDim.test
geom/sql/functions/Tests/ST_Dimension.test
geom/sql/functions/Tests/ST_GeomFromText.test
geom/sql/functions/Tests/ST_GeometryN.test
geom/sql/functions/Tests/ST_GeometryType.test
geom/sql/functions/Tests/ST_IsClosed.test
geom/sql/functions/Tests/ST_IsEmpty.test
geom/sql/functions/Tests/ST_IsRing.test
geom/sql/functions/Tests/ST_IsSimple.test
geom/sql/functions/Tests/ST_IsValid.test
geom/sql/functions/Tests/ST_LineFromText.test
geom/sql/functions/Tests/ST_MLineFromText.test
geom/sql/functions/Tests/ST_MPointFromText.test
geom/sql/functions/Tests/ST_MPolygonFromText.test
geom/sql/functions/Tests/ST_MakePoint.test
geom/sql/functions/Tests/ST_NPoints.test
geom/sql/functions/Tests/ST_NRings.test
geom/sql/functions/Tests/ST_NumGeometries.test
geom/sql/functions/Tests/ST_NumInteriorRings.test
geom/sql/functions/Tests/ST_NumPoints.test
geom/sql/functions/Tests/ST_PointFromText.test
geom/sql/functions/Tests/ST_PolygonFromText.test
geom/sql/functions/Tests/XYZ.test
geom/sql/functions/Tests/XYZMinMax.test
geom/sql/functions/Tests/dropTestGeometries.test
geom/sql/functions/Tests/dropTestWKT.test
geom/sql/functions/Tests/loadTestGeometries.test
geom/sql/functions/Tests/loadTestWKT.test
geom/sql/pg_regression/Tests/boundary.test
geom/sql/pg_regression/Tests/delaunaytriangles.test
geom/sql/pg_regression/Tests/dump.test
geom/sql/pg_regression/Tests/dumppoints.test
geom/sql/pg_regression/Tests/regress_ogc_cover.test
geom/sql/pg_regression/Tests/regression_load2D.test
geom/sql/pg_regression/Tests/regression_load3D.test
geom/sql/pg_regression/Tests/regression_load4D.test
Branch: default
Log Message:
Reapprove geom tests.
diffs (truncated from 1702 to 300 lines):
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.test
b/geom/BugTracker/Tests/X_crash.SF-1971632.test
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.test
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.test
@@ -29,3 +29,4 @@ DROP TABLE geoms
statement ok
set optimizer = 'default_pipe'
+
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.test
@@ -12,4 +12,3 @@ 45111956, \'POINT(52.0697 4.3723)\'
statement ok
drop table nodes
-
diff --git a/geom/sql/conformance/Tests/T1.test
b/geom/sql/conformance/Tests/T1.test
--- a/geom/sql/conformance/Tests/T1.test
+++ b/geom/sql/conformance/Tests/T1.test
@@ -1,6 +1,15 @@
query T rowsort
SELECT f_table_name FROM geometry_columns ORDER BY f_table_name
----
-11 values hashing to c4c2fd32627fe8478eeeb74c8a76c7c7
+bridges
+buildings
+buildings
+divided_routes
+forests
+lakes
+map_neatlines
+named_places
+ponds
+road_segments
+streams
-
diff --git a/geom/sql/conformance/Tests/T10.test
b/geom/sql/conformance/Tests/T10.test
--- a/geom/sql/conformance/Tests/T10.test
+++ b/geom/sql/conformance/Tests/T10.test
@@ -3,4 +3,3 @@ SELECT ST_SRID(boundary) FROM named_plac
----
101
-
diff --git a/geom/sql/conformance/Tests/T11.test
b/geom/sql/conformance/Tests/T11.test
--- a/geom/sql/conformance/Tests/T11.test
+++ b/geom/sql/conformance/Tests/T11.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsEmpty(centerline) FROM road_segments WHERE name = 'Route 5' AND
aliases = 'Main Street'
----
-False
+0
-
diff --git a/geom/sql/conformance/Tests/T12.test
b/geom/sql/conformance/Tests/T12.test
--- a/geom/sql/conformance/Tests/T12.test
+++ b/geom/sql/conformance/Tests/T12.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsSimple(shore) FROM lakes WHERE name = 'Blue Lake'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T13.test
b/geom/sql/conformance/Tests/T13.test
--- a/geom/sql/conformance/Tests/T13.test
+++ b/geom/sql/conformance/Tests/T13.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Boundary(boundary))
----
LINESTRING (67 13, 67 18, 59 18, 59 13, 67 13)
-
diff --git a/geom/sql/conformance/Tests/T14.test
b/geom/sql/conformance/Tests/T14.test
--- a/geom/sql/conformance/Tests/T14.test
+++ b/geom/sql/conformance/Tests/T14.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Envelope(boundary))
----
POLYGON ((59 13, 67 13, 67 18, 59 18, 59 13))
-
diff --git a/geom/sql/conformance/Tests/T15.test
b/geom/sql/conformance/Tests/T15.test
--- a/geom/sql/conformance/Tests/T15.test
+++ b/geom/sql/conformance/Tests/T15.test
@@ -3,4 +3,3 @@ SELECT ST_X("position") FROM bridges WHE
----
44.000
-
diff --git a/geom/sql/conformance/Tests/T16.test
b/geom/sql/conformance/Tests/T16.test
--- a/geom/sql/conformance/Tests/T16.test
+++ b/geom/sql/conformance/Tests/T16.test
@@ -3,4 +3,3 @@ SELECT ST_Y("position") FROM bridges WHE
----
31.000
-
diff --git a/geom/sql/conformance/Tests/T17.test
b/geom/sql/conformance/Tests/T17.test
--- a/geom/sql/conformance/Tests/T17.test
+++ b/geom/sql/conformance/Tests/T17.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_StartPoint(centerlin
----
POINT (0 18)
-
diff --git a/geom/sql/conformance/Tests/T18.test
b/geom/sql/conformance/Tests/T18.test
--- a/geom/sql/conformance/Tests/T18.test
+++ b/geom/sql/conformance/Tests/T18.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_EndPoint(centerline)
----
POINT (44 31)
-
diff --git a/geom/sql/conformance/Tests/T2.test
b/geom/sql/conformance/Tests/T2.test
--- a/geom/sql/conformance/Tests/T2.test
+++ b/geom/sql/conformance/Tests/T2.test
@@ -3,4 +3,3 @@ SELECT f_geometry_column FROM geometry_c
----
centerline
-
diff --git a/geom/sql/conformance/Tests/T21.test
b/geom/sql/conformance/Tests/T21.test
--- a/geom/sql/conformance/Tests/T21.test
+++ b/geom/sql/conformance/Tests/T21.test
@@ -3,4 +3,3 @@ SELECT ST_Length(centerline) FROM road_s
----
26.000
-
diff --git a/geom/sql/conformance/Tests/T22.test
b/geom/sql/conformance/Tests/T22.test
--- a/geom/sql/conformance/Tests/T22.test
+++ b/geom/sql/conformance/Tests/T22.test
@@ -3,4 +3,3 @@ SELECT ST_NumPoints(centerline) FROM roa
----
5
-
diff --git a/geom/sql/conformance/Tests/T23.test
b/geom/sql/conformance/Tests/T23.test
--- a/geom/sql/conformance/Tests/T23.test
+++ b/geom/sql/conformance/Tests/T23.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_PointN(centerline, 1
----
POINT (10 21)
-
diff --git a/geom/sql/conformance/Tests/T24.test
b/geom/sql/conformance/Tests/T24.test
--- a/geom/sql/conformance/Tests/T24.test
+++ b/geom/sql/conformance/Tests/T24.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Centroid(boundary))
----
POINT (63 15.5)
-
diff --git a/geom/sql/conformance/Tests/T25.test
b/geom/sql/conformance/Tests/T25.test
--- a/geom/sql/conformance/Tests/T25.test
+++ b/geom/sql/conformance/Tests/T25.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Contains(boundary, ST_PointOnSurface(boundary)) FROM named_places
WHERE name = 'Goose Island'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T26.test
b/geom/sql/conformance/Tests/T26.test
--- a/geom/sql/conformance/Tests/T26.test
+++ b/geom/sql/conformance/Tests/T26.test
@@ -3,4 +3,3 @@ SELECT ST_Area(boundary) FROM named_plac
----
40.000
-
diff --git a/geom/sql/conformance/Tests/T27.test
b/geom/sql/conformance/Tests/T27.test
--- a/geom/sql/conformance/Tests/T27.test
+++ b/geom/sql/conformance/Tests/T27.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_ExteriorRing(shore))
----
LINESTRING (52 18, 66 23, 73 9, 48 6, 52 18)
-
diff --git a/geom/sql/conformance/Tests/T28.test
b/geom/sql/conformance/Tests/T28.test
--- a/geom/sql/conformance/Tests/T28.test
+++ b/geom/sql/conformance/Tests/T28.test
@@ -3,4 +3,3 @@ SELECT ST_NumInteriorRing(shore) FROM la
----
1
-
diff --git a/geom/sql/conformance/Tests/T29.test
b/geom/sql/conformance/Tests/T29.test
--- a/geom/sql/conformance/Tests/T29.test
+++ b/geom/sql/conformance/Tests/T29.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_InteriorRingN(shore,
----
LINESTRING (59 18, 67 18, 67 13, 59 13, 59 18)
-
diff --git a/geom/sql/conformance/Tests/T3.test
b/geom/sql/conformance/Tests/T3.test
--- a/geom/sql/conformance/Tests/T3.test
+++ b/geom/sql/conformance/Tests/T3.test
@@ -3,4 +3,3 @@ SELECT coord_dimension FROM geometry_col
----
2
-
diff --git a/geom/sql/conformance/Tests/T30.test
b/geom/sql/conformance/Tests/T30.test
--- a/geom/sql/conformance/Tests/T30.test
+++ b/geom/sql/conformance/Tests/T30.test
@@ -3,4 +3,3 @@ SELECT ST_NumGeometries(centerlines) FRO
----
2
-
diff --git a/geom/sql/conformance/Tests/T31.test
b/geom/sql/conformance/Tests/T31.test
--- a/geom/sql/conformance/Tests/T31.test
+++ b/geom/sql/conformance/Tests/T31.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_GeometryN(centerline
----
LINESTRING (16 0, 16 23, 16 48)
-
diff --git a/geom/sql/conformance/Tests/T32.test
b/geom/sql/conformance/Tests/T32.test
--- a/geom/sql/conformance/Tests/T32.test
+++ b/geom/sql/conformance/Tests/T32.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_IsClosed(centerlines) FROM divided_routes WHERE name = 'Route 75'
----
-False
+0
-
diff --git a/geom/sql/conformance/Tests/T33.test
b/geom/sql/conformance/Tests/T33.test
--- a/geom/sql/conformance/Tests/T33.test
+++ b/geom/sql/conformance/Tests/T33.test
@@ -3,4 +3,3 @@ SELECT ST_Length(centerlines) FROM divid
----
96.000
-
diff --git a/geom/sql/conformance/Tests/T34.test
b/geom/sql/conformance/Tests/T34.test
--- a/geom/sql/conformance/Tests/T34.test
+++ b/geom/sql/conformance/Tests/T34.test
@@ -3,4 +3,3 @@ SELECT ST_AsText(ST_Centroid(shores)) FR
----
POINT (25 42)
-
diff --git a/geom/sql/conformance/Tests/T35.test
b/geom/sql/conformance/Tests/T35.test
--- a/geom/sql/conformance/Tests/T35.test
+++ b/geom/sql/conformance/Tests/T35.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Contains(shores, ST_PointOnSurface(shores)) FROM ponds WHERE fid =
120
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T36.test
b/geom/sql/conformance/Tests/T36.test
--- a/geom/sql/conformance/Tests/T36.test
+++ b/geom/sql/conformance/Tests/T36.test
@@ -3,4 +3,3 @@ SELECT ST_Area(shores) FROM ponds WHERE
----
8.000
-
diff --git a/geom/sql/conformance/Tests/T37.test
b/geom/sql/conformance/Tests/T37.test
--- a/geom/sql/conformance/Tests/T37.test
+++ b/geom/sql/conformance/Tests/T37.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Equals(boundary, ST_PolygonFromText('POLYGON( ( 67 13, 67 18, 59 18,
59 13, 67 13) )',101)) FROM named_places WHERE name = 'Goose Island'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T38.test
b/geom/sql/conformance/Tests/T38.test
--- a/geom/sql/conformance/Tests/T38.test
+++ b/geom/sql/conformance/Tests/T38.test
@@ -1,6 +1,5 @@
-query T rowsort
+query I rowsort
SELECT ST_Disjoint(centerlines, boundary) FROM divided_routes, named_places
WHERE divided_routes.name = 'Route 75' AND named_places.name = 'Ashton'
----
-True
+1
-
diff --git a/geom/sql/conformance/Tests/T39.test
b/geom/sql/conformance/Tests/T39.test
--- a/geom/sql/conformance/Tests/T39.test
+++ b/geom/sql/conformance/Tests/T39.test
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
