[postgis-tickets] [SCM] PostGIS branch stable-3.4 updated. 3.4.0-33-gb328e7452

[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  b328e7452793eec40978f61e65d5c47d0198bc6e (commit)
      from  2c36d0c61d7a94a63d333090c397e6a64affb35a (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 b328e7452793eec40978f61e65d5c47d0198bc6e
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Oct 17 22:22:46 2023 +0200

    Fix extraction of skip signatures from function with variadic args
    
    Closes #5576 in 3.4 branch (3.4.1dev)

diff --git a/NEWS b/NEWS
index a3b875ddc..546e4d82f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
 * Bug Fixes *
 
 
- - #5574, #5575, Fix restore of postgis dumps from 3.0 (Sandro Santilli)
+ - #5574, #5575, #5576, Fix restore of postgis dumps from 3.0 (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/create_skip_signatures.pl b/utils/create_skip_signatures.pl
index 231ddae71..32a571a1f 100644
--- a/utils/create_skip_signatures.pl
+++ b/utils/create_skip_signatures.pl
@@ -75,15 +75,12 @@ sub strip_argument_names {
 		my $a = $_;
 
 		#print "  XXX arg: $a\n";
-		# If the arg is composed by multiple words
-		# drop the first, unless it's a reserved word
-		if ( $a =~ m/([^ ]*) (.*)/ )
+		# Drop all but reserved words from multi-word arg
+		while ( $a =~ m/^([^ ]*) (.*)/ )
 		{
-			unless ( $reserved_sql_word{$1} )
-			{
-				$a = $2;
-				#print "  XXX arg became: $a\n";
-			}
+			last if $reserved_sql_word{$1};
+			$a = $2;
+			#print "  XXX arg became: $a\n";
 		}
 		push @out, $a;
 	}
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index c6e23ba48..1f1b8f64e 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -634,10 +634,6 @@ DEFAULT topology id
 DOMAIN topoelement
 DOMAIN topoelementarray
 FK CONSTRAINT layer layer_topology_id_fkey
-FUNCTION addrasterconstraints(name, name, name, text[])
-FUNCTION addrasterconstraints(name, name, text[])
-FUNCTION droprasterconstraints(name, name, name, text[])
-FUNCTION droprasterconstraints(name, name, text[])
 FUNCTION jsonb(geometry)
 FUNCTION json(geometry)
 FUNCTION lockrow(text, text, text, text, timestamp without time zone)
@@ -659,11 +655,7 @@ FUNCTION _st_hillshade4ma(double precision[], integer[], text[])
 FUNCTION st_intersection(geometry, geometry)
 FUNCTION st_invdistweight4ma(double precision[], integer[], text[])
 FUNCTION _st_mapalgebra(rastbandarg[], regprocedure, text, integer, integer, text, raster, double precision[], boolean, text[])
-FUNCTION st_mapalgebra(rastbandarg[], regprocedure, text, text, raster, integer, integer, text[])
-FUNCTION st_mapalgebra(raster, integer, raster, integer, regprocedure, text, text, raster, integer, integer, text[])
 FUNCTION st_mapalgebra(raster, integer, regprocedure, double precision[], boolean, text, text, raster, text[])
-FUNCTION st_mapalgebra(raster, integer, regprocedure, text, text, raster, integer, integer, text[])
-FUNCTION st_mapalgebra(raster, integer[], regprocedure, text, text, raster, integer, integer, text[])
 FUNCTION st_max4ma(double precision[], integer[], text[])
 FUNCTION st_max4ma(double precision[], text, text[])
 FUNCTION st_mean4ma(double precision[], integer[], text[])
@@ -674,8 +666,6 @@ FUNCTION st_mindist4ma(double precision[], integer[], text[])
 FUNCTION st_range4ma(double precision[], integer[], text[])
 FUNCTION st_range4ma(double precision[], text, text[])
 FUNCTION st_rastertoworldcoord(raster, integer, integer)
-FUNCTION _st_reclass(raster, reclassarg[])
-FUNCTION st_reclass(raster, reclassarg[])
 FUNCTION _st_roughness4ma(double precision[], integer[], text[])
 FUNCTION st_setvalues(raster, integer, integer, integer, double precision[], boolean[], boolean)
 FUNCTION _st_setvalues(raster, integer, integer, integer, double precision[], boolean[], boolean, double precision, boolean)

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

Summary of changes:
 NEWS                            |  2 +-
 utils/create_skip_signatures.pl | 13 +++++--------
 utils/postgis_restore.pl.in     | 10 ----------
 3 files changed, 6 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
PostGIS