[SCM] PostGIS branch stable-3.4 updated. 3.4.1-16-g61b71ba09

[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  61b71ba09c98e9d9a3548035e7fcec93c2b0ebc1 (commit)
      from  b0943c0abe468c7a6fd07f88e27514aac3440808 (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 61b71ba09c98e9d9a3548035e7fcec93c2b0ebc1
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Dec 26 17:46:14 2023 +0100

    Use escaped string to not depend on standard_conforming_strings
    
    References #5633 in 3.4 branch (3.4.2dev)

diff --git a/NEWS b/NEWS
index caf1708ae..6980c40fa 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
 
 * Bug Fixes *
 
+ - #5633, Fix postgis load and upgrade with standard_conforming_strings set
+          to off (Sandro Santilli, Regina Obe)
  - #5571, Memory over-allocation for narrow inputs (Paul Ramsey)
  - #5610, Regression fix: Allow Nan and infinity again
           in ST_SetPoint (Regina Obe)
diff --git a/postgis/common_after_upgrade.sql b/postgis/common_after_upgrade.sql
index 09f9ea2a4..5e9ec2b0f 100644
--- a/postgis/common_after_upgrade.sql
+++ b/postgis/common_after_upgrade.sql
@@ -51,7 +51,7 @@ BEGIN
 
         new_name := pg_catalog.regexp_replace(
             rec.proc::text,
-            '_deprecated_by_postgis[^(]*\(.*',
+            E'_deprecated_by_postgis[^(]*\\(.*',
             ''
         );
 
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 6d654879e..f011f3695 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -29,7 +29,7 @@ DO $$
 DECLARE
 	pgver text;
 BEGIN
-	SELECT pg_catalog.substring(pg_catalog.version(), 'PostgreSQL ([0-9\.]+)') INTO pgver;
+	SELECT pg_catalog.substring(pg_catalog.version(), E'PostgreSQL ([0-9\\.]+)') INTO pgver;
 
 	IF POSTGIS_PGSQL_VERSION::text != ( SELECT CASE
 		WHEN pg_catalog.split_part(s,'.',1)::integer > 9
@@ -37,7 +37,7 @@ BEGIN
 		ELSE
 			pg_catalog.split_part(s,'.', 1) || pg_catalog.split_part(s,'.', 2)
 		END
-		FROM pg_catalog.substring(pg_catalog.version(), 'PostgreSQL ([0-9\.]+)') AS s )
+		FROM pg_catalog.substring(pg_catalog.version(), E'PostgreSQL ([0-9\\.]+)') AS s )
 	THEN
 		RAISE EXCEPTION 'PostGIS built for PostgreSQL % cannot be loaded in PostgreSQL %',
 			POSTGIS_PGSQL_HR_VERSION, pgver;
@@ -3097,7 +3097,7 @@ CREATE OR REPLACE FUNCTION _postgis_pgsql_version() RETURNS text
 AS $$
 	SELECT CASE WHEN pg_catalog.split_part(s,'.',1)::integer > 9 THEN pg_catalog.split_part(s,'.',1) || '0'
 	ELSE pg_catalog.split_part(s,'.', 1) || pg_catalog.split_part(s,'.', 2) END AS v
-	FROM pg_catalog.substring(version(), 'PostgreSQL ([0-9\.]+)') AS s;
+	FROM pg_catalog.substring(version(), E'PostgreSQL ([0-9\\.]+)') AS s;
 $$ LANGUAGE 'sql' STABLE;
 
 -- Availability: 2.5.0
diff --git a/regress/hooks/use-all-functions.sql b/regress/hooks/use-all-functions.sql
index 62d0405ea..74e5f2517 100644
--- a/regress/hooks/use-all-functions.sql
+++ b/regress/hooks/use-all-functions.sql
@@ -13,8 +13,8 @@ BEGIN
 							oid::regprocedure::text,
 							'double precision', 'float8'
 						),
-						'\(([^)])',
-						'(NULL::\1'
+						E'\\(([^)])',
+						E'(NULL::\\1'
 					),
 					',',
 					',NULL::',

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

Summary of changes:
 NEWS                                | 2 ++
 postgis/common_after_upgrade.sql    | 2 +-
 postgis/postgis.sql.in              | 6 +++---
 regress/hooks/use-all-functions.sql | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS