[postgis-tickets] [SCM] PostGIS branch main updated. 3.2.0beta1-20-gad50a3871

[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  ad50a38713ffdc8ce413ce1175eae859e51a4c8b (commit)
       via  9b4efcfe3a273e538a1826bd85ff3c697e0ccef4 (commit)
      from  085cc7f045277d91b9c245e6530165917346923b (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 ad50a38713ffdc8ce413ce1175eae859e51a4c8b
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Nov 9 14:25:57 2021 +0100

    Do not leave temporary tables around upon finding ring validity errors
    
    References #5017 in master/main branch
    Includes regression test

diff --git a/topology/sql/manage/ValidateTopology.sql.in b/topology/sql/manage/ValidateTopology.sql.in
index c2ad76d84..5d8c1c576 100644
--- a/topology/sql/manage/ValidateTopology.sql.in
+++ b/topology/sql/manage/ValidateTopology.sql.in
@@ -892,6 +892,8 @@ BEGIN
   END LOOP;
 
   IF has_invalid_edge_linking THEN
+    DROP TABLE IF EXISTS pg_temp.hole_check;
+    DROP TABLE IF EXISTS pg_temp.shell_check;
     RETURN; -- does not make sense to continue
   END IF;
 
@@ -904,6 +906,7 @@ BEGIN
 
   IF has_invalid_rings THEN
     DROP TABLE IF EXISTS pg_temp.hole_check;
+    DROP TABLE IF EXISTS pg_temp.shell_check;
     RETURN; -- does not make sense to continue
   END IF;
 
diff --git a/topology/test/regress/validatetopology.sql b/topology/test/regress/validatetopology.sql
index ab67acb1a..2d7caeaa5 100644
--- a/topology/test/regress/validatetopology.sql
+++ b/topology/test/regress/validatetopology.sql
@@ -145,5 +145,16 @@ SELECT '#4830.5', (ValidateTopology('city_data')).* UNION
 SELECT '#4830.5', '---', null, null ORDER BY 1,2,3,4;
 ROLLBACK;
 
+-- Test ability to call twice in a transaction
+-- in presence of mixed face labeling
+-- See https://trac.osgeo.org/postgis/ticket/5017
+BEGIN;
+SELECT '#5017.0', (ValidateTopology('city_data'));
+SELECT '#5017.1', (ValidateTopology('city_data'));
+update city_data.edge_data SET left_face = 8 WHERE edge_id = 10;
+SELECT '#5017.2', (ValidateTopology('city_data')).error;
+SELECT '#5017.3', (ValidateTopology('city_data')).error;
+ROLLBACK;
+
 SELECT NULL FROM topology.DropTopology('city_data');
 
diff --git a/topology/test/regress/validatetopology_expected b/topology/test/regress/validatetopology_expected
index 182e21655..9a19cc6c2 100644
--- a/topology/test/regress/validatetopology_expected
+++ b/topology/test/regress/validatetopology_expected
@@ -31,3 +31,5 @@
 #4830.4|hole not in advertised face|-25|
 #4830.5|---||
 #4830.5|hole not in advertised face|-26|
+#5017.2|mixed face labeling in ring
+#5017.3|mixed face labeling in ring

commit 9b4efcfe3a273e538a1826bd85ff3c697e0ccef4
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Oct 21 22:52:18 2021 +0200

    Official chat room is now the Matrix room

diff --git a/README.md b/README.md
index 32e1a4f7b..bafe4bd37 100644
--- a/README.md
+++ b/README.md
@@ -17,19 +17,10 @@ https://trac.osgeo.org/postgis/
 
 ## Official chat room:
 
-Official chat room is the #postgis:osgeo.org room on the
-[Libera.chat](https://libera.chat) network.
-
-To participate, point your preferred
-[IRC client](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients)
-to:
-
- irc://irc.libera.chat/#postgis
-
-Or try a web IRC client like:
- - [web.libera.chat](https://web.libera.chat/#postgis)
-
-Or join via [matrix](https://matrix.to/#/#postgis:osgeo.org)
+Official chat room is the [#postgis:osgeo.org](href="https://matrix.to/#/#postgis:osgeo.org)
+Matrix room, also bridged to the irc://irc.libera.chat/#postgis
+[IRC](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients) channel
+([web client](https://web.libera.chat/#postgis) may be useful)
 
 ## Official source tarball releases
 

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

Summary of changes:
 README.md                                       | 17 ++++-------------
 topology/sql/manage/ValidateTopology.sql.in     |  3 +++
 topology/test/regress/validatetopology.sql      | 11 +++++++++++
 topology/test/regress/validatetopology_expected |  2 ++
 4 files changed, 20 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
PostGIS