[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-694-ga4ac60f6d

[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  a4ac60f6d405b21f08f24021aeee20634eb63514 (commit)
      from  ef5a742b5b8dae8beae5ede0adaee90919e99069 (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 a4ac60f6d405b21f08f24021aeee20634eb63514
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
    
    References #5576 in master branch (3.5.0dev)

diff --git a/utils/create_skip_signatures.pl b/utils/create_skip_signatures.pl
index 7db9885e7..9995d4127 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 906b0a684..f282608b4 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -637,10 +637,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)
@@ -654,11 +650,7 @@ FUNCTION _st_grayscale4ma(double precision[], integer[], text[])
 FUNCTION _st_hillshade4ma(double precision[], integer[], text[])
 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[])
@@ -669,8 +661,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:
 utils/create_skip_signatures.pl | 13 +++++--------
 utils/postgis_restore.pl.in     | 10 ----------
 2 files changed, 5 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
PostGIS