[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-335-g8828402cc
git at osgeo.org
git at osgeo.org
Thu Jan 20 12:58:44 PST 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, master has been updated
via 8828402ccb84023294ae0e1e0292d3cb2b0841ca (commit)
via 2424b1ed0fc63efcd07b2b98e1499035960e3a9c (commit)
from d2358992e0918633adf96875e5731d804638fe9c (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 8828402ccb84023294ae0e1e0292d3cb2b0841ca
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 21:36:19 2022 +0100
Enable tests found disabled by `make check_test_enabled`
CI was not catching this because the test was disabled
in commit 11dc1c60d8dbf5e534d1d32b1731038d92bf2be2
see #5062
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 739145cee..31663725d 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -89,6 +89,7 @@ TESTS += \
$(topsrcdir)/regress/core/remove_repeated_points \
$(topsrcdir)/regress/core/removepoint \
$(topsrcdir)/regress/core/reverse \
+ $(topsrcdir)/regress/core/scroll \
$(topsrcdir)/regress/core/setpoint \
$(topsrcdir)/regress/core/simplify \
$(topsrcdir)/regress/core/simplifyvw \
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index 8255316c4..c709e81f3 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -23,12 +23,13 @@ TESTS += \
$(topsrcdir)/topology/test/regress/addface.sql \
$(topsrcdir)/topology/test/regress/addnode.sql \
$(topsrcdir)/topology/test/regress/addtopogeometrycolumn.sql \
- $(topsrcdir)/topology/test/regress/copytopology.sql \
$(topsrcdir)/topology/test/regress/cleartopogeom.sql \
+ $(topsrcdir)/topology/test/regress/copytopology.sql \
$(topsrcdir)/topology/test/regress/createtopogeom.sql \
$(topsrcdir)/topology/test/regress/createtopology.sql \
$(topsrcdir)/topology/test/regress/droptopogeometrycolumn.sql \
$(topsrcdir)/topology/test/regress/droptopology.sql \
+ $(topsrcdir)/topology/test/regress/findlayer.sql \
$(topsrcdir)/topology/test/regress/findtopology.sql \
$(topsrcdir)/topology/test/regress/geometry_cast.sql \
$(topsrcdir)/topology/test/regress/getedgebypoint.sql \
@@ -61,6 +62,7 @@ TESTS += \
$(topsrcdir)/topology/test/regress/st_newedgessplit.sql \
$(topsrcdir)/topology/test/regress/st_remedgemodface.sql \
$(topsrcdir)/topology/test/regress/st_remedgenewface.sql \
+ $(topsrcdir)/topology/test/regress/st_removeisoedge.sql \
$(topsrcdir)/topology/test/regress/st_removeisonode.sql \
$(topsrcdir)/topology/test/regress/st_simplify.sql \
$(topsrcdir)/topology/test/regress/topo2.5d.sql \
@@ -69,11 +71,11 @@ TESTS += \
$(topsrcdir)/topology/test/regress/topogeo_addlinestring.sql \
$(topsrcdir)/topology/test/regress/topogeo_addpoint.sql \
$(topsrcdir)/topology/test/regress/topogeo_addpolygon.sql \
- $(topsrcdir)/topology/test/regress/topogeom_edit.sql \
- $(topsrcdir)/topology/test/regress/topogeom_addtopogeom.sql \
+ $(topsrcdir)/topology/test/regress/topogeom_addtopogeom.sql \
+ $(topsrcdir)/topology/test/regress/topogeom_edit.sql \
+ $(topsrcdir)/topology/test/regress/topogeometry_srid.sql \
$(topsrcdir)/topology/test/regress/topogeometry_type.sql \
$(topsrcdir)/topology/test/regress/topojson.sql \
- $(topsrcdir)/topology/test/regress/topologysummary.sql \
+ $(topsrcdir)/topology/test/regress/topologysummary.sql \
$(topsrcdir)/topology/test/regress/totopogeom.sql \
$(topsrcdir)/topology/test/regress/validatetopology.sql
-
commit 2424b1ed0fc63efcd07b2b98e1499035960e3a9c
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 20 21:56:58 2022 +0100
Fix ST_Srid(TopoGeometry) usage against a set of TopoGeometries
References #5063 in master branch (3.3.0dev)
diff --git a/topology/sql/topogeometry/srid.sql.in b/topology/sql/topogeometry/srid.sql.in
index 14f50d553..c937510ed 100644
--- a/topology/sql/topogeometry/srid.sql.in
+++ b/topology/sql/topogeometry/srid.sql.in
@@ -19,8 +19,8 @@ CREATE OR REPLACE FUNCTION topology.ST_Srid(tg topology.TopoGeometry)
AS
$$
SELECT srid FROM topology.topology
- WHERE id = id(tg);
+ WHERE id = topology_id(tg);
$$
-LANGUAGE 'sql' STABLE STRICT;
+LANGUAGE 'sql' VOLATILE STRICT;
-- }
diff --git a/topology/test/regress/topogeometry_srid.sql b/topology/test/regress/topogeometry_srid.sql
index 08fe7dafa..e8faca595 100644
--- a/topology/test/regress/topogeometry_srid.sql
+++ b/topology/test/regress/topogeometry_srid.sql
@@ -1,27 +1,27 @@
set client_min_messages to WARNING;
\i :top_builddir/topology/test/load_topology.sql
-\i ../load_features.sql
-\i ../more_features.sql
-\i ../hierarchy.sql
+\i :regdir/../topology/test/load_features.sql
+\i :regdir/../topology/test/more_features.sql
+\i :regdir/../topology/test/hierarchy.sql
SELECT DISTINCT 'ST_Srid(traffic_signs)',
- geometrytype(feature) FROM features.traffic_signs;
+ st_srid(feature) FROM features.traffic_signs;
SELECT DISTINCT 'ST_Srid(city_streets)',
- geometrytype(feature) FROM features.city_streets;
+ st_srid(feature) FROM features.city_streets;
SELECT DISTINCT 'ST_Srid(land_parcels)',
- geometrytype(feature) FROM features.land_parcels;
+ st_srid(feature) FROM features.land_parcels;
SELECT DISTINCT 'ST_Srid(big_signs)',
- geometrytype(feature) FROM features.big_signs;
+ st_srid(feature) FROM features.big_signs;
SELECT DISTINCT 'ST_Srid(big_streets)',
- geometrytype(feature) FROM features.big_streets;
+ st_srid(feature) FROM features.big_streets;
SELECT DISTINCT 'ST_Srid(big_parcels)',
- geometrytype(feature) FROM features.big_parcels;
+ st_srid(feature) FROM features.big_parcels;
SELECT topology.DropTopology('city_data');
DROP SCHEMA features CASCADE;
diff --git a/topology/test/regress/topogeometry_srid_expected b/topology/test/regress/topogeometry_srid_expected
index 28ba36ec5..57336f103 100644
--- a/topology/test/regress/topogeometry_srid_expected
+++ b/topology/test/regress/topogeometry_srid_expected
@@ -1,19 +1,7 @@
-t
-9
-22
-26
-1
-2
-3
-4
-features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2
-5
-6
-features.big_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2
-ST_Srid(traffic_signs)|MULTIPOINT
-ST_Srid(city_streets)|MULTILINESTRING
-ST_Srid(land_parcels)|MULTIPOLYGON
-ST_Srid(big_signs)|MULTIPOINT
-ST_Srid(big_streets)|MULTILINESTRING
-ST_Srid(big_parcels)|MULTIPOLYGON
+ST_Srid(traffic_signs)|0
+ST_Srid(city_streets)|0
+ST_Srid(land_parcels)|0
+ST_Srid(big_signs)|0
+ST_Srid(big_streets)|0
+ST_Srid(big_parcels)|0
Topology 'city_data' dropped
-----------------------------------------------------------------------
Summary of changes:
regress/core/tests.mk.in | 1 +
topology/sql/topogeometry/srid.sql.in | 4 ++--
topology/test/regress/topogeometry_srid.sql | 18 +++++++++---------
topology/test/regress/topogeometry_srid_expected | 24 ++++++------------------
topology/test/tests.mk | 12 +++++++-----
5 files changed, 25 insertions(+), 34 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list