[SCM] PostGIS branch master updated. 3.4.0rc1-867-g03e8bc97e

[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  03e8bc97e2015d466aee4b15819c9f65e781e68e (commit)
       via  6f0f6ef6d46b42c88d8969f4d1b6982b226fa677 (commit)
       via  fb0a6302ede53e19bf696eae183f8010eeab8b57 (commit)
       via  300a616c3fc616605e0bb0d55cb5abdd81e88daf (commit)
      from  18e7f66cfc6f51179bed0866c600891679684d6a (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 03e8bc97e2015d466aee4b15819c9f65e781e68e
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

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 69cbb00d5..08e13a05d 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;
@@ -3124,7 +3124,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::',

commit 6f0f6ef6d46b42c88d8969f4d1b6982b226fa677
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Dec 5 10:38:05 2023 +0100

    [woodie] add upgrade tests with standard_conforming_strings off
    
    References #5633

diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index cd7a228aa..642b5bb7a 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -39,6 +39,10 @@ variables:
     - wait # for tee process to flush its buffers
     - echo "-- Summary of upgrade tests --"
     - egrep '(PASS|FAIL|SKIP|INFO|ERROR)' check.log
+    - echo "-- Upgrade tests with standard_conforming_strings off --"
+    - RUNTESTFLAGS="$${RUNTESTFLAGS} --after-create-db-script $${SRCDIR}/regress/hooks/standard-conforming-strings-off.sql"
+      MAKE_ARGS='TESTS=$${SRCDIR}/regress/core/regress'
+      $${SRCDIR}/utils/check_all_upgrades.sh -s :auto!
 
 clone:
   clone:

commit fb0a6302ede53e19bf696eae183f8010eeab8b57
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Dec 5 10:37:41 2023 +0100

    Add hook to set standard_conforming_string off in test database
    
    References #5633

diff --git a/regress/hooks/standard-conforming-strings-off.sql b/regress/hooks/standard-conforming-strings-off.sql
new file mode 100644
index 000000000..6b15d2100
--- /dev/null
+++ b/regress/hooks/standard-conforming-strings-off.sql
@@ -0,0 +1,12 @@
+-- See https://trac.osgeo.org/postgis/ticket/5633
+DO $BODY$
+BEGIN
+	EXECUTE format(
+		$$
+			ALTER DATABASE %I
+			SET standard_conforming_strings to off
+		$$,
+		current_database()
+	);
+END;
+$BODY$ LANGUAGE 'plpgsql';

commit 300a616c3fc616605e0bb0d55cb5abdd81e88daf
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Dec 27 08:50:18 2023 +0100

    Avoid double inclusion of postgis_revision.h
    
    The header is already pulled in by postgis_config.h which is
    included by liblwgeom_internal.h

diff --git a/liblwgeom/lwgeom_api.c b/liblwgeom/lwgeom_api.c
index 43e5d374b..e966251d5 100644
--- a/liblwgeom/lwgeom_api.c
+++ b/liblwgeom/lwgeom_api.c
@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include "../postgis_revision.h"
 
 #define xstr(s) str(s)
 #define str(s) #s

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

Summary of changes:
 .woodpecker/regress.yml                           |  4 ++++
 liblwgeom/lwgeom_api.c                            |  1 -
 postgis/common_after_upgrade.sql                  |  2 +-
 postgis/postgis.sql.in                            |  6 +++---
 regress/hooks/standard-conforming-strings-off.sql | 12 ++++++++++++
 regress/hooks/use-all-functions.sql               |  4 ++--
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 regress/hooks/standard-conforming-strings-off.sql


hooks/post-receive
-- 
PostGIS