[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. a4a040c4949089f32b63e6a647d1d9696992a132

[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-2.5 has been updated
       via  a4a040c4949089f32b63e6a647d1d9696992a132 (commit)
      from  5ecbf4eecc455c7c5d1aacc9141e0e3b4f8c48b3 (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 a4a040c4949089f32b63e6a647d1d9696992a132
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 ee79d96..057a464 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PostGIS 2.5.4
   - #4547, Fix AddRasterConstraints handling of empty tables (Sandro Santilli)
   - #4549, Fix schema qualification of internal types (Raúl Marín)
   - #4546, Fix PLPGSQL functions missing the schema qualification (Raúl Marín)
+  - #4588, Fix update when st_union(geometry) doesn't exist (Raúl Marín)
 
 
 PostGIS 2.5.3
diff --git a/postgis/postgis_drop_after.sql b/postgis/postgis_drop_after.sql
index 6c06156..9dabf00 100644
--- a/postgis/postgis_drop_after.sql
+++ b/postgis/postgis_drop_after.sql
@@ -185,8 +185,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_drop_after.sql | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS