[postgis-tickets] [SCM] PostGIS branch main updated. 3.2.0alpha1-35-gb58c971

[git at osgeo.org]

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, main has been updated
       via  b58c9714bfe3f5748a932de8a1f890c7a1446d1d (commit)
      from  fbc4c1e66b69c8395d48b1ca07b426aec7586bf7 (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 b58c9714bfe3f5748a932de8a1f890c7a1446d1d
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Sep 27 23:06:18 2021 +0200

    Print ring identifier for 'face has multiple shells' error

diff --git a/topology/sql/manage/ValidateTopology.sql.in b/topology/sql/manage/ValidateTopology.sql.in
index 82dca61..c2ad76d 100644
--- a/topology/sql/manage/ValidateTopology.sql.in
+++ b/topology/sql/manage/ValidateTopology.sql.in
@@ -483,7 +483,7 @@ BEGIN
     ) --}{
     SELECT ring_id, geom as ring_geom, side_faces
     FROM all_rings_with_ring_geom
-  LOOP --{
+  LOOP --}{
 
     found_rings := found_rings + 1;
 
@@ -546,7 +546,7 @@ BEGIN
       EXCEPTION WHEN unique_violation THEN
         retrec.error = 'face has multiple shells';
         retrec.id1 = rec.side_faces[1];
-        retrec.id2 = NULL;
+        retrec.id2 = rec.ring_id;
         RETURN NEXT retrec;
       END;
     ELSE -- }{ It's an hole (CW)
diff --git a/topology/test/regress/validatetopology_expected b/topology/test/regress/validatetopology_expected
index 4b98f6d..182e216 100644
--- a/topology/test/regress/validatetopology_expected
+++ b/topology/test/regress/validatetopology_expected
@@ -20,7 +20,7 @@
 #4944|mixed face labeling in ring|-21|
 #4944|mixed face labeling in ring|-19|
 #4945|---||
-#4945|face has multiple shells|3|
+#4945|face has multiple shells|3|-17
 #4830.1|---||
 #4830.1|hole not in advertised face|-25|
 #4830.2|---||

-----------------------------------------------------------------------

Summary of changes:
 topology/sql/manage/ValidateTopology.sql.in     | 4 ++--
 topology/test/regress/validatetopology_expected | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS