[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 3.0.6-12-g3c7e31fd5
git at osgeo.org
git at osgeo.org
Fri Aug 12 02:58:10 PDT 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-3.0 has been updated
via 3c7e31fd5f3ba3d98dc88afcc69c982a4486a081 (commit)
from 21bb44fc1ddda8db6a87d799ab39f365eb1a8519 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3c7e31fd5f3ba3d98dc88afcc69c982a4486a081
Author: Sandro Santilli <strk at kbt.io>
Date: Wed Oct 28 22:12:55 2020 +0100
Use relative paths in topology tests
References #4777 in 3.0 branch (3.0.7dev)
Should fix regression test broken by upgrading of
run_test.pl in commit a0c29068d
diff --git a/topology/test/regress/cleartopogeom.sql b/topology/test/regress/cleartopogeom.sql
index e3697dbe5..6f27f7649 100644
--- a/topology/test/regress/cleartopogeom.sql
+++ b/topology/test/regress/cleartopogeom.sql
@@ -1,8 +1,8 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i load_topology.sql
-\i load_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
SELECT 'relation before', count(distinct topogeo_id)
FROM city_data.relation
diff --git a/topology/test/regress/copytopology.sql b/topology/test/regress/copytopology.sql
index 744082821..aca4a2a34 100644
--- a/topology/test/regress/copytopology.sql
+++ b/topology/test/regress/copytopology.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology-4326.sql
-\i load_features.sql
-\i more_features.sql
+\i ../load_topology-4326.sql
+\i ../load_features.sql
+\i ../more_features.sql
SELECT topology.CopyTopology('city_data', 'CITY_data_UP_down') > 0;
diff --git a/topology/test/regress/getnodeedges.sql b/topology/test/regress/getnodeedges.sql
index f5f8e3e74..e4198b1a1 100644
--- a/topology/test/regress/getnodeedges.sql
+++ b/topology/test/regress/getnodeedges.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
SELECT 'N'||node_id, (topology.GetNodeEdges('city_data', node_id)).*
FROM city_data.node ORDER BY node_id, sequence;
diff --git a/topology/test/regress/getringedges.sql b/topology/test/regress/getringedges.sql
index 20874e5dd..88b4bd4c9 100644
--- a/topology/test/regress/getringedges.sql
+++ b/topology/test/regress/getringedges.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
SELECT 'R'||edge_id, (topology.GetRingEdges('city_data', edge_id)).*
FROM city_data.edge;
diff --git a/topology/test/regress/gettopogeomelements.sql b/topology/test/regress/gettopogeomelements.sql
index 5d765ba0c..e3a70afc5 100644
--- a/topology/test/regress/gettopogeomelements.sql
+++ b/topology/test/regress/gettopogeomelements.sql
@@ -1,7 +1,7 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
SELECT lid, tid, GetTopoGeomElements('city_data', lid, tid)
FROM (
diff --git a/topology/test/regress/gml.sql b/topology/test/regress/gml.sql
index 58fcb519e..0582ca7cb 100644
--- a/topology/test/regress/gml.sql
+++ b/topology/test/regress/gml.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology-4326.sql
-\i load_features.sql
-\i more_features.sql
+\i ../load_topology-4326.sql
+\i ../load_features.sql
+\i ../more_features.sql
--- Puntual single element {
diff --git a/topology/test/regress/legacy_invalid.sql b/topology/test/regress/legacy_invalid.sql
index 25187f411..bb2f91619 100644
--- a/topology/test/regress/legacy_invalid.sql
+++ b/topology/test/regress/legacy_invalid.sql
@@ -1,6 +1,6 @@
set client_min_messages to WARNING;
-\i invalid_topology.sql
+\i ../invalid_topology.sql
-- clean up
SELECT topology.DropTopology('invalid_topology');
diff --git a/topology/test/regress/legacy_predicate.sql b/topology/test/regress/legacy_predicate.sql
index 567d2f6d7..88ee4da42 100644
--- a/topology/test/regress/legacy_predicate.sql
+++ b/topology/test/regress/legacy_predicate.sql
@@ -1,10 +1,10 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
-\i more_features.sql
-\i hierarchy.sql
-\i topo_predicates.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
+\i ../topo_predicates.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/legacy_query.sql b/topology/test/regress/legacy_query.sql
index d0b903d20..21d0fd39e 100644
--- a/topology/test/regress/legacy_query.sql
+++ b/topology/test/regress/legacy_query.sql
@@ -2,11 +2,11 @@ set client_min_messages to WARNING;
-- Tests TopoGeometry->Geometry cast and id(TopoGeometry)
-\i load_topology.sql
-\i load_features.sql
-\i more_features.sql
-\i hierarchy.sql
-\i query_features.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
+\i ../query_features.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/legacy_validate.sql b/topology/test/regress/legacy_validate.sql
index d325e706f..1dd8f0428 100644
--- a/topology/test/regress/legacy_validate.sql
+++ b/topology/test/regress/legacy_validate.sql
@@ -1,7 +1,7 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i validate_topology.sql
+\i ../load_topology.sql
+\i ../validate_topology.sql
-- clean up
SELECT topology.DropTopology('city_data');
diff --git a/topology/test/regress/st_addedgemodface.sql b/topology/test/regress/st_addedgemodface.sql
index 2939c2214..047bd6c45 100644
--- a/topology/test/regress/st_addedgemodface.sql
+++ b/topology/test/regress/st_addedgemodface.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
-- Endpoint / node mismatch
SELECT topology.ST_AddEdgeModFace('city_data', 7, 6,
diff --git a/topology/test/regress/st_addedgenewfaces.sql b/topology/test/regress/st_addedgenewfaces.sql
index 71cfd994c..db90018b9 100644
--- a/topology/test/regress/st_addedgenewfaces.sql
+++ b/topology/test/regress/st_addedgenewfaces.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
-- Endpoint / node mismatch
SELECT topology.ST_AddEdgeNewFaces('city_data', 7, 6,
diff --git a/topology/test/regress/st_addisonode.sql b/topology/test/regress/st_addisonode.sql
index 5f97654e0..441387644 100644
--- a/topology/test/regress/st_addisonode.sql
+++ b/topology/test/regress/st_addisonode.sql
@@ -3,7 +3,7 @@ set client_min_messages to WARNING;
-- Usual city_data input
-\i load_topology.sql
+\i ../load_topology.sql
-- NULL exceptions
select ST_AddIsoNode(NULL, 0, 'POINT(1 4)');
diff --git a/topology/test/regress/st_changeedgegeom.sql b/topology/test/regress/st_changeedgegeom.sql
index 757944977..3eff183f7 100644
--- a/topology/test/regress/st_changeedgegeom.sql
+++ b/topology/test/regress/st_changeedgegeom.sql
@@ -1,6 +1,6 @@
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
-- good one
SELECT 'T1', topology.ST_ChangeEdgeGeom('city_data', 25,
diff --git a/topology/test/regress/st_modedgeheal.sql b/topology/test/regress/st_modedgeheal.sql
index 2e86ece49..83229926d 100644
--- a/topology/test/regress/st_modedgeheal.sql
+++ b/topology/test/regress/st_modedgeheal.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i load_topology.sql
+\i ../load_topology.sql
SELECT topology.ST_ModEdgeHeal('city_data', 1, null);
SELECT topology.ST_ModEdgeHeal('city_data', null, 1);
diff --git a/topology/test/regress/st_modedgesplit.sql b/topology/test/regress/st_modedgesplit.sql
index c813d1417..98310fe34 100644
--- a/topology/test/regress/st_modedgesplit.sql
+++ b/topology/test/regress/st_modedgesplit.sql
@@ -3,7 +3,7 @@
set client_min_messages to WARNING;
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/st_newedgeheal.sql b/topology/test/regress/st_newedgeheal.sql
index c2b74dd76..e49979fe9 100644
--- a/topology/test/regress/st_newedgeheal.sql
+++ b/topology/test/regress/st_newedgeheal.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i load_topology.sql
+\i ../load_topology.sql
SELECT topology.ST_NewEdgeHeal('city_data', 1, null);
SELECT topology.ST_NewEdgeHeal('city_data', null, 1);
diff --git a/topology/test/regress/st_newedgessplit.sql b/topology/test/regress/st_newedgessplit.sql
index 6cedc9702..abaeafd97 100644
--- a/topology/test/regress/st_newedgessplit.sql
+++ b/topology/test/regress/st_newedgessplit.sql
@@ -3,7 +3,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/st_remedgemodface.sql b/topology/test/regress/st_remedgemodface.sql
index 101b47539..a8ac67434 100644
--- a/topology/test/regress/st_remedgemodface.sql
+++ b/topology/test/regress/st_remedgemodface.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Utility functions for the test {
@@ -375,9 +375,9 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i load_topology.sql
-\i load_features.sql
-\i cache_geometries.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../cache_geometries.sql
-- A city_street is defined by edge 3, can't drop
SELECT '*RM(3)', topology.ST_RemEdgeModFace('city_data', 3);
diff --git a/topology/test/regress/st_remedgenewface.sql b/topology/test/regress/st_remedgenewface.sql
index 90cf30b03..c5f5413ba 100644
--- a/topology/test/regress/st_remedgenewface.sql
+++ b/topology/test/regress/st_remedgenewface.sql
@@ -2,7 +2,7 @@
set client_min_messages to ERROR;
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Utility functions for the test {
@@ -375,9 +375,9 @@ SELECT topology.DropTopology('city_data');
-- {
-- Import city_data
-\i load_topology.sql
-\i load_features.sql
-\i cache_geometries.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../cache_geometries.sql
-- A city_street is defined by edge 3, can't drop
SELECT '*RN(3)', topology.ST_RemEdgeNewFace('city_data', 3);
diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 37c7e5622..3ab2265c4 100644
--- a/topology/test/regress/topogeo_addlinestring.sql
+++ b/topology/test/regress/topogeo_addlinestring.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Save max node id
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/topogeo_addpoint.sql b/topology/test/regress/topogeo_addpoint.sql
index b7c4f9292..3f7cd3e80 100644
--- a/topology/test/regress/topogeo_addpoint.sql
+++ b/topology/test/regress/topogeo_addpoint.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
-- Invalid calls
SELECT 'invalid', TopoGeo_addPoint('city_data', 'LINESTRING(36 26, 38 30)');
diff --git a/topology/test/regress/topogeo_addpolygon.sql b/topology/test/regress/topogeo_addpolygon.sql
index f21379fce..68863b0b5 100644
--- a/topology/test/regress/topogeo_addpolygon.sql
+++ b/topology/test/regress/topogeo_addpolygon.sql
@@ -1,7 +1,7 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-\i load_topology.sql
+\i ../load_topology.sql
-- Save max node,edge and face ids
select 'node'::text as what, max(node_id) INTO city_data.limits FROM city_data.node;
diff --git a/topology/test/regress/topogeometry_type.sql b/topology/test/regress/topogeometry_type.sql
index 05c21fe3e..4da8a3167 100644
--- a/topology/test/regress/topogeometry_type.sql
+++ b/topology/test/regress/topogeometry_type.sql
@@ -1,9 +1,9 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
-\i more_features.sql
-\i hierarchy.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../more_features.sql
+\i ../hierarchy.sql
SELECT DISTINCT 'GeometryType(traffic_signs)',
geometrytype(feature) FROM features.traffic_signs;
diff --git a/topology/test/regress/topojson.sql b/topology/test/regress/topojson.sql
index 6a0aad4fc..e5ccf1444 100644
--- a/topology/test/regress/topojson.sql
+++ b/topology/test/regress/topojson.sql
@@ -1,8 +1,8 @@
set client_min_messages to WARNING;
-\i load_topology.sql
-\i load_features.sql
-\i hierarchy.sql
+\i ../load_topology.sql
+\i ../load_features.sql
+\i ../hierarchy.sql
-- This edges perturbate the topology so that walking around the boundaries
-- of P1 and P2 may require walking on some of them
-----------------------------------------------------------------------
Summary of changes:
topology/test/regress/cleartopogeom.sql | 4 ++--
topology/test/regress/copytopology.sql | 6 +++---
topology/test/regress/getnodeedges.sql | 2 +-
topology/test/regress/getringedges.sql | 2 +-
topology/test/regress/gettopogeomelements.sql | 4 ++--
topology/test/regress/gml.sql | 6 +++---
topology/test/regress/legacy_invalid.sql | 2 +-
topology/test/regress/legacy_predicate.sql | 10 +++++-----
topology/test/regress/legacy_query.sql | 10 +++++-----
topology/test/regress/legacy_validate.sql | 4 ++--
topology/test/regress/st_addedgemodface.sql | 2 +-
topology/test/regress/st_addedgenewfaces.sql | 2 +-
topology/test/regress/st_addisonode.sql | 2 +-
topology/test/regress/st_changeedgegeom.sql | 2 +-
topology/test/regress/st_modedgeheal.sql | 2 +-
topology/test/regress/st_modedgesplit.sql | 2 +-
topology/test/regress/st_newedgeheal.sql | 2 +-
topology/test/regress/st_newedgessplit.sql | 2 +-
topology/test/regress/st_remedgemodface.sql | 8 ++++----
topology/test/regress/st_remedgenewface.sql | 8 ++++----
topology/test/regress/topogeo_addlinestring.sql | 2 +-
topology/test/regress/topogeo_addpoint.sql | 2 +-
topology/test/regress/topogeo_addpolygon.sql | 2 +-
topology/test/regress/topogeometry_type.sql | 8 ++++----
topology/test/regress/topojson.sql | 6 +++---
25 files changed, 51 insertions(+), 51 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list