[postgis-tickets] [SCM] PostGIS branch stable-3.4 updated. 3.4.0-44-g817e9d0e3

[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.4 has been updated
       via  817e9d0e3cbe3f7a539f8386223bfbe1ef10dade (commit)
       via  a6fcbf27d9af238991290d76e6245009669d30ad (commit)
       via  029584e50c3808873c52d32bef0aba2490598078 (commit)
       via  e4838d9b88d51709bb76b780d4efd8d5e314e310 (commit)
      from  bc51b1a6dd813aeb1c253f23e2cee4c5a5099166 (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 817e9d0e3cbe3f7a539f8386223bfbe1ef10dade
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 11:40:58 2023 +0200

    Skip shelltype when type is skipped
    
    Closes #5569 in 3.4 branch (3.4.1dev)

diff --git a/NEWS b/NEWS
index 83a9091eb..3446965be 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,8 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
 * Bug Fixes *
 
 
- - #5574, #5575, #5576, #5577, #5578, #5579,
-          Fix restore of postgis dumps (Sandro Santilli)
+ - #5574, #5575, #5576, #5577, #5578, #5579, #5569
+          Fix restore of postgis dumps since 2.1 (Sandro Santilli)
  - #5568, Improve robustness of topology face split handling (Sandro Santilli)
  - #5548, Fix box-filtered validity check of topologies with edge-less faces
           (Sandro Santilli)
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index a68f4a718..4fcd73fb8 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -137,6 +137,9 @@ while( my $l = <DUMP> ) {
   # always skip associated comments associated to objects,
   # see https://trac.osgeo.org/postgis/ticket/3078
   $sig =~ s/^COMMENT//g;
+  # always skip shelltype when type is skipped
+  # see https://trac.osgeo.org/postgis/ticket/5569#comment:16
+  $sig =~ s/^SHELLTYPE/TYPE/g;
   $sig =~ s/\s//g;
   $hasTopology = 1 if $sig eq 'SCHEMAtopology';
 

commit a6fcbf27d9af238991290d76e6245009669d30ad
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 11:29:48 2023 +0200

    Drop deprecated pgis_abs based functions from <2.5 dumps
    
    References #5569 in 3.4 branch (3.4.1dev)

diff --git a/postgis/postgis_after_upgrade.sql b/postgis/postgis_after_upgrade.sql
index 168b9c120..7469567eb 100644
--- a/postgis/postgis_after_upgrade.sql
+++ b/postgis/postgis_after_upgrade.sql
@@ -171,9 +171,17 @@ SELECT _postgis_drop_function_by_signature('ST_AsBinary(text)'); -- deprecated i
 SELECT _postgis_drop_function_by_signature('postgis_uses_stats()'); -- deprecated in 2.0
 SELECT _postgis_drop_function_by_signature('ST_GeneratePoints(geometry, numeric)'); -- numeric -> integer
 
--- Old accum aggregate support type, removed in 2.5.0
--- See #4035
-DROP TYPE IF EXISTS pgis_abs CASCADE;
+-- Old accum aggregate support type, removed in 2.5.0 See #4035
+SELECT _postgis_drop_function_by_signature('pgis_abs_in(cstring)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_abs_out(pgis_abs)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_accum_finalfn(pgis_abs)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_accum_transfn(pgis_abs, geometry)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_collect_finalfn(pgis_abs)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_makeline_finalfn(pgis_abs)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_polygonize_finalfn(pgis_abs)', '2.5.0');
+SELECT _postgis_drop_function_by_signature('pgis_geometry_union_finalfn(pgis_abs)', '2.5.0');
+DROP TYPE IF EXISTS pgis_abs CASCADE; -- TODO: use a _postgis_drop_type ?
+
 
 SELECT _postgis_drop_function_by_signature('st_astwkb(geometry, integer, bigint, bool, bool)'); -- temporarely introduced before 2.2.0 final
 SELECT _postgis_drop_function_by_signature('pgis_twkb_accum_transfn(internal, geometry, integer)'); -- temporarely introduced before 2.2.0 final

commit 029584e50c3808873c52d32bef0aba2490598078
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 12:42:01 2023 +0200

    Fix deprecation of functions taking deprecated types

diff --git a/postgis/common_before_upgrade.sql b/postgis/common_before_upgrade.sql
index 29b9f59fe..6492a5778 100644
--- a/postgis/common_before_upgrade.sql
+++ b/postgis/common_before_upgrade.sql
@@ -102,9 +102,15 @@ BEGIN
 		INTO proc;
 
 	EXCEPTION
-	WHEN undefined_function THEN
+	WHEN undefined_function OR undefined_object THEN
 		RAISE DEBUG 'Deprecated function % does not exist', function_signature;
 		RETURN;
+	WHEN others THEN
+		GET STACKED DIAGNOSTICS detail := PG_EXCEPTION_DETAIL;
+		RAISE WARNING 'Could not check deprecated function % existance, got % (%), assuming it does not exist',
+			function_signature, SQLERRM, SQLSTATE
+		USING DETAIL = detail;
+		RETURN;
 	END;
 
 	sql := pg_catalog.format(

commit e4838d9b88d51709bb76b780d4efd8d5e314e310
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 11:41:19 2023 +0200

    Don't bother checking empty lines

diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 5ccb04178..a68f4a718 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -132,6 +132,7 @@ while( my $l = <DUMP> ) {
 
   next if $l =~ /^\;/;
   my $sigHR = linesignature($l);
+  next unless length($sigHR);
   my $sig = $sigHR;
   # always skip associated comments associated to objects,
   # see https://trac.osgeo.org/postgis/ticket/3078

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

Summary of changes:
 NEWS                              |  4 ++--
 postgis/common_before_upgrade.sql |  8 +++++++-
 postgis/postgis_after_upgrade.sql | 14 +++++++++++---
 utils/postgis_restore.pl.in       |  4 ++++
 4 files changed, 24 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS