[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-695-gcc1607004

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

    Fix restore of dumps with topology from 3.1
    
    References #5577 in master branch (3.5.0dev)

diff --git a/topology/topology_before_upgrade.sql.in b/topology/topology_before_upgrade.sql.in
index aa0c7252f..bf4104c0d 100644
--- a/topology/topology_before_upgrade.sql.in
+++ b/topology/topology_before_upgrade.sql.in
@@ -13,34 +13,20 @@
 -- argument names changed --
 -- we might want to take toTopoGeom one out before release since
 -- I don't think too many people installed the bad name
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.toTopoGeom(Geometry, varchar, int, float8)
-');
+SELECT _postgis_drop_function_by_signature('topology.toTopoGeom(Geometry, varchar, int, float8)');
 
 -- used to be in public, will now be moved to topology
-SELECT NULL FROM _postgis_drop_function_by_signature('
-public.postgis_topology_scripts_installed()
-');
+SELECT _postgis_drop_function_by_signature('public.postgis_topology_scripts_installed()');
 
 -- Removed in 2.2.0 when topology API moved to liblwgeom
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology._ST_RemEdgeCheck(varchar, integer, integer, integer, integer)
-', '2.2.0');
+SELECT _postgis_drop_function_by_signature('topology._ST_RemEdgeCheck(varchar, integer, integer, integer, integer)', '2.2.0');
 -- Removed in 2.2.0 when topology API moved to liblwgeom
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology._ST_AddFaceSplit(varchar, integer, integer, boolean)
-', '2.2.0');
+SELECT _postgis_drop_function_by_signature('topology._ST_AddFaceSplit(varchar, integer, integer, boolean)', '2.2.0');
 
 -- Added optional bbox parameter in 3.2.0
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.validatetopology(varchar)
-', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.validatetopology(varchar)', '3.2.0');
 
 -- Merged the two function into one with both allowEdgeSplitting and setContainingFace parameters
 -- being optional (3.2.0)
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.AddNode(varchar, geometry)
-', '3.2.0');
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.AddNode(varchar, geometry, boolean, boolean)
-', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.AddNode(varchar, geometry)', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.AddNode(varchar, geometry, boolean, boolean)', '3.2.0');
diff --git a/utils/create_skip_signatures.pl b/utils/create_skip_signatures.pl
index 9995d4127..7d67fda0a 100644
--- a/utils/create_skip_signatures.pl
+++ b/utils/create_skip_signatures.pl
@@ -205,12 +205,12 @@ while (<>)
 	# Deprecated function signature using
 	# _postgis_drop_function_by_signature
 	# EXAMPLE: SELECT _postgis_drop_function_by_signature('pgis_geometry_union_finalfn(internal)');
-	elsif ( /SELECT _postgis_drop_function_by_signature\('[^']*'\);/ )
+	elsif ( /SELECT _postgis_drop_function_by_signature\('[^']*'/ )
 	{
 		my $origline = $_;
 		my $line = $origline;
 
-		$line =~ s/SELECT _postgis_drop_function_by_signature\('([^']*)'\);/$1/;
+		$line =~ s/.*SELECT _postgis_drop_function_by_signature\('([^']*)'.*/$1/;
 
 		handle_function_signature($line);
 	}

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

Summary of changes:
 topology/topology_before_upgrade.sql.in | 28 +++++++---------------------
 utils/create_skip_signatures.pl         |  4 ++--
 2 files changed, 9 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
PostGIS