[postgis-tickets] [SCM] PostGIS branch master updated. 5887c919048bd2af01542f4dc53da3693e59197a

[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, master has been updated
       via  5887c919048bd2af01542f4dc53da3693e59197a (commit)
      from  60bb1915f187d47c219eeac4f0f7edb7cc7cf4b2 (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 5887c919048bd2af01542f4dc53da3693e59197a
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
    
    Closes https://github.com/postgis/postgis/pull/517
    References #4588

diff --git a/NEWS b/NEWS
index aa23b3d..e18dfb0 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ PostGIS 3.1.0
            ST_SnapToGrid optimized. (Darafei Praliaskouski)
   - #4574, Link Time Optimizations enabled (Darafei Praliaskouski)
   - #4578, Add parallellism and cost properties to brin functions (Raúl Marín)
+  - #4473, Silence yacc warnings (Raúl Marín)
 
 * Bug fixes *
   - #4544, Fix leak when parsing a WKT geometry_list (Raúl Marín)
@@ -26,7 +27,7 @@ PostGIS 3.1.0
   - #4549, Fix several functions when the schema isn't the search_path (Raúl Marín)
   - #4546, Fix PLPGSQL functions missing the schema qualification (Raúl Marín)
   - #4558, Fix oversimplification of polygon inner rings (Raúl Marín)
-  - #4473, Silence yacc warnings (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                              | 3 ++-
 postgis/postgis_after_upgrade.sql | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
PostGIS