[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.7-10-g4a78ce4e9
git at osgeo.org
git at osgeo.org
Fri Aug 12 03:44:36 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-2.5 has been updated
via 4a78ce4e94e1f4982e42cec6f66645e20b59c87e (commit)
via 85d0c00ecc13c61e05b3c3fc1c5a482ff77ae8ec (commit)
via 4bdfea50cd2cc5450a57ed5ae91d136adaaef55c (commit)
from ca3fccb94f03b1fac17e7398ecba39d602404e7c (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 4a78ce4e94e1f4982e42cec6f66645e20b59c87e
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 2.5 branch (2.5.8dev)
Should fix regression test broken by upgrading of
run_test.pl in commit 35b17931f
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 1703a1d4f..61c2fae21 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 2425f18e4..aed4c0b32 100644
--- a/topology/test/regress/st_modedgesplit.sql
+++ b/topology/test/regress/st_modedgesplit.sql
@@ -5,7 +5,7 @@ set client_min_messages to WARNING;
INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-- 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 68b9d8a4f..2e47a5d9a 100644
--- a/topology/test/regress/st_newedgessplit.sql
+++ b/topology/test/regress/st_newedgessplit.sql
@@ -5,7 +5,7 @@ set client_min_messages to ERROR;
INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-- 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 9fb596198..dcdc0eef7 100644
--- a/topology/test/regress/st_remedgemodface.sql
+++ b/topology/test/regress/st_remedgemodface.sql
@@ -4,7 +4,7 @@ set client_min_messages to ERROR;
INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Utility functions for the test {
@@ -377,9 +377,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 ba7c10168..238c12511 100644
--- a/topology/test/regress/st_remedgenewface.sql
+++ b/topology/test/regress/st_remedgenewface.sql
@@ -4,7 +4,7 @@ set client_min_messages to ERROR;
INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-- Import city_data
-\i load_topology-4326.sql
+\i ../load_topology-4326.sql
-- Utility functions for the test {
@@ -377,9 +377,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 460229a2c..0bac7183b 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
commit 85d0c00ecc13c61e05b3c3fc1c5a482ff77ae8ec
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Aug 12 12:31:28 2022 +0200
Stop using custom SRIDs in tests
Custom SRIDs are not needed anymore in these tests
since upgrade of run_test.pl committed in 35b17931f
(and breaking the testsuite)
This is a backport of commit aafcb2e8
diff --git a/regress/loader/ReprojectPts-post.sql b/regress/loader/ReprojectPts-post.sql
deleted file mode 100644
index 03ec0db9f..000000000
--- a/regress/loader/ReprojectPts-post.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Cleanup
-DELETE FROM spatial_ref_sys;
diff --git a/regress/loader/ReprojectPts-pre.sql b/regress/loader/ReprojectPts-pre.sql
deleted file mode 100644
index 20c08f687..000000000
--- a/regress/loader/ReprojectPts-pre.sql
+++ /dev/null
@@ -1,11 +0,0 @@
---- In case this test is running in an extension context
-TRUNCATE spatial_ref_sys;
----
---- EPSG 4326 : WGS 84
----
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ');
----
---- EPSG 2260 : NAD83 / New York East (ftUS)
----
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (2260,'EPSG',2260,'PROJCS["NAD83 / New York East (ftUS)",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["US survey foot",0.3048006096012192,AUTHORITY["EPSG","9003"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",38.83333333333334],PARAMETER["central_meridian",-74.5],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",492125],PARAMETER["false_northing",0],AUTHORITY["EPSG","2260"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=tmerc +lat_0=38.83333333333334 +lon_0=-74.5 +k=0.9999 +x_0=150000 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs ');
-
diff --git a/regress/loader/ReprojectPtsGeog-post.sql b/regress/loader/ReprojectPtsGeog-post.sql
deleted file mode 100644
index 1f3bcbdab..000000000
--- a/regress/loader/ReprojectPtsGeog-post.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- cleanup
-DELETE FROM spatial_ref_sys;
diff --git a/regress/loader/ReprojectPtsGeog-pre.sql b/regress/loader/ReprojectPtsGeog-pre.sql
deleted file mode 100644
index dfe50eab6..000000000
--- a/regress/loader/ReprojectPtsGeog-pre.sql
+++ /dev/null
@@ -1,9 +0,0 @@
----
---- EPSG 4326 : WGS 84
----
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (4326,'EPSG',4326,'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]','+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ');
----
---- EPSG 2260 : NAD83 / New York East (ftUS)
----
-INSERT INTO "spatial_ref_sys" ("srid","auth_name","auth_srid","srtext","proj4text") VALUES (2260,'EPSG',2260,'PROJCS["NAD83 / New York East (ftUS)",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["US survey foot",0.3048006096012192,AUTHORITY["EPSG","9003"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",38.83333333333334],PARAMETER["central_meridian",-74.5],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",492125],PARAMETER["false_northing",0],AUTHORITY["EPSG","2260"],AXIS["X",EAST],AXIS["Y",NORTH]]','+proj=tmerc +lat_0=38.83333333333334 +lon_0=-74.5 +k=0.9999 +x_0=150000 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs ');
-
diff --git a/topology/test/regress/copytopology.sql b/topology/test/regress/copytopology.sql
index 182ff493c..1703a1d4f 100644
--- a/topology/test/regress/copytopology.sql
+++ b/topology/test/regress/copytopology.sql
@@ -1,6 +1,5 @@
set client_min_messages to WARNING;
-INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
\i load_topology-4326.sql
\i load_features.sql
\i more_features.sql
@@ -57,4 +56,3 @@ select '#2184.2', st_addisonode('t3d', NULL, 'POINT(1 2 3)');
select '#2184.3', topology.copyTopology('t3d', 't3d-bis') > 0;
select '#2184.4', length(topology.dropTopology('t3d')) > 0, length(topology.dropTopology('t3d-bis')) > 0;
-DELETE FROM spatial_ref_sys where srid = 4326;
diff --git a/topology/test/regress/gml.sql b/topology/test/regress/gml.sql
index aadbe017d..58fcb519e 100644
--- a/topology/test/regress/gml.sql
+++ b/topology/test/regress/gml.sql
@@ -1,7 +1,5 @@
set client_min_messages to WARNING;
-INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-
\i load_topology-4326.sql
\i load_features.sql
\i more_features.sql
@@ -218,5 +216,4 @@ ORDER BY name;
SELECT topology.DropTopology('city_data');
DROP SCHEMA features CASCADE;
-DELETE FROM spatial_ref_sys where srid = 4326;
DROP TABLE visited;
diff --git a/topology/test/regress/topogeo_addlinestring.sql b/topology/test/regress/topogeo_addlinestring.sql
index 2bc106141..460229a2c 100644
--- a/topology/test/regress/topogeo_addlinestring.sql
+++ b/topology/test/regress/topogeo_addlinestring.sql
@@ -1,8 +1,6 @@
\set VERBOSITY terse
set client_min_messages to ERROR;
-INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( 'EPSG', 4326, 4326, '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs' );
-
\i load_topology-4326.sql
-- Save max node id
@@ -270,7 +268,6 @@ SELECT * FROM ValidateTopology('city_data');
-- Cleanups
DROP FUNCTION check_changes(text,boolean);
SELECT DropTopology('city_data');
-DELETE FROM spatial_ref_sys where srid = 4326;
-- See http://trac.osgeo.org/postgis/ticket/3280
SELECT 't3280.start', topology.CreateTopology('bug3280') > 0;
commit 4bdfea50cd2cc5450a57ed5ae91d136adaaef55c
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Aug 12 11:22:55 2022 +0200
Allow running `make staged-install` from top-level dir
diff --git a/GNUmakefile.in b/GNUmakefile.in
index c08aaafcf..c806319e4 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -37,6 +37,9 @@ test: check
check: all docs-check check-no-trailing-blanks
+staged-install: all
+ $(MAKE) -C regress staged-install
+
check-no-trailing-blanks:
! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
grep -v lwin_wkt_lex.c | \
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile.in | 3 +++
regress/loader/ReprojectPts-post.sql | 2 --
regress/loader/ReprojectPts-pre.sql | 11 -----------
regress/loader/ReprojectPtsGeog-post.sql | 2 --
regress/loader/ReprojectPtsGeog-pre.sql | 9 ---------
topology/test/regress/cleartopogeom.sql | 4 ++--
topology/test/regress/copytopology.sql | 8 +++-----
topology/test/regress/getnodeedges.sql | 2 +-
topology/test/regress/getringedges.sql | 2 +-
topology/test/regress/gettopogeomelements.sql | 4 ++--
topology/test/regress/gml.sql | 9 +++------
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 | 5 +----
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 +++---
30 files changed, 54 insertions(+), 83 deletions(-)
delete mode 100644 regress/loader/ReprojectPts-post.sql
delete mode 100644 regress/loader/ReprojectPts-pre.sql
delete mode 100644 regress/loader/ReprojectPtsGeog-post.sql
delete mode 100644 regress/loader/ReprojectPtsGeog-pre.sql
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list