[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 1e39cf048e352b71c6846dfb305a9c203abf854f

[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, stable-3.0 has been updated
       via  1e39cf048e352b71c6846dfb305a9c203abf854f (commit)
      from  318bfa75b9968b95a3f958bb7199b5a25c72752d (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 1e39cf048e352b71c6846dfb305a9c203abf854f
Author: Raúl Marín <git at rmr.ninja>
Date:   Fri Nov 22 11:42:41 2019 +0100

    Avoid throwing during update if st_union(geometry) doesn't exist
    
    References #4588

diff --git a/NEWS b/NEWS
index 6980476..dd41485 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ XXXX/XX/XX
 
 * Bug Fixes and Enhancements
   - #4558, Fix oversimplification of polygon inner rings (Raúl Marín)
+  - #4588, Fix update when st_union(geometry) doesn't exist (Raúl Marín)
 
 
 PostGIS 3.0.0
diff --git a/postgis/postgis_after_upgrade.sql b/postgis/postgis_after_upgrade.sql
index 2c0fb94..9bbd5cc 100644
--- a/postgis/postgis_after_upgrade.sql
+++ b/postgis/postgis_after_upgrade.sql
@@ -243,8 +243,12 @@ $$
 BEGIN
 IF _postgis_scripts_pgsql_version()::integer >= 96 THEN
 -- mark ST_Union agg as parallel safe if it is not already
-	UPDATE pg_proc SET proparallel = 's'
-	WHERE oid = 'st_union(geometry)'::regprocedure AND proparallel = 'u';
+        BEGIN
+            UPDATE pg_proc SET proparallel = 's'
+            WHERE oid = 'st_union(geometry)'::regprocedure AND proparallel = 'u';
+        EXCEPTION WHEN OTHERS THEN
+            RAISE DEBUG 'Could not update st_union(geometry): %', SQLERRM;
+        END;
 END IF;
 END;
 $$;

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

Summary of changes:
 NEWS                              | 1 +
 postgis/postgis_after_upgrade.sql | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS