[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.5-15-ga0b0c8df9

[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.1 has been updated
       via  a0b0c8df96868f87d6cc3effd1d353a8302549fd (commit)
      from  84b2a722b1c88e54aec846790b777c313cba1fe3 (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 a0b0c8df96868f87d6cc3effd1d353a8302549fd
Author: Regina Obe <lr at pcorp.us>
Date:   Sun May 29 15:00:45 2022 -0400

    More schema qual fixes. References #5155 for PostGIS 3.1.6

diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index e40f03a9f..55fc2c921 100644
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -113,11 +113,11 @@ BEGIN
 	WITH settings AS (
 		SELECT pg_catalog.unnest(setconfig) config
 		FROM pg_catalog.pg_db_role_setting
-		WHERE setdatabase = (
+		WHERE setdatabase OPERATOR(pg_catalog.=) (
 			SELECT oid
 			FROM pg_catalog.pg_database
-			WHERE datname = current_database()
-		) and setrole = 0
+			WHERE datname OPERATOR(pg_catalog.=) pg_catalog.current_database()
+		) and setrole OPERATOR(pg_catalog.=) 0
 	)
 	SELECT pg_catalog.regexp_replace(config, '^search_path=', '')
 	FROM settings WHERE config like 'search_path=%'
@@ -129,21 +129,23 @@ BEGIN
 		SELECT reset_val
 		INTO var_cur_search_path
 		FROM pg_catalog.pg_settings
-		WHERE name = 'search_path';
+		WHERE name OPERATOR(pg_catalog.=) 'search_path';
 
 		RAISE NOTICE 'cur_search_path from pg_settings is %', var_cur_search_path;
 	END IF;
-	IF var_cur_search_path LIKE '%' || pg_catalog.quote_ident(a_schema_name) || '%' THEN
-		var_result := a_schema_name || ' already in database search_path';
+
+
+	IF var_cur_search_path LIKE '%' OPERATOR(pg_catalog.||) pg_catalog.quote_ident(a_schema_name) OPERATOR(pg_catalog.||) '%' THEN
+		var_result := a_schema_name OPERATOR(pg_catalog.||) ' already in database search_path';
 	ELSE
-		var_cur_search_path := var_cur_search_path || ', '
-                        || pg_catalog.quote_ident(a_schema_name);
-		EXECUTE 'ALTER DATABASE ' || pg_catalog.quote_ident(pg_catalog.current_database())
-                              || ' SET search_path = ' || var_cur_search_path;
-		var_result := a_schema_name || ' has been added to end of database search_path ';
+		var_cur_search_path := var_cur_search_path OPERATOR(pg_catalog.||) ', '
+                       OPERATOR(pg_catalog.||) pg_catalog.quote_ident(a_schema_name);
+		EXECUTE 'ALTER DATABASE ' OPERATOR(pg_catalog.||) pg_catalog.quote_ident(pg_catalog.current_database())
+                             OPERATOR(pg_catalog.||) ' SET search_path = ' OPERATOR(pg_catalog.||) var_cur_search_path;
+		var_result := a_schema_name OPERATOR(pg_catalog.||) ' has been added to end of database search_path ';
 	END IF;
 
-	EXECUTE 'SET search_path = ' || var_cur_search_path;
+	EXECUTE 'SET search_path = ' OPERATOR(pg_catalog.||) var_cur_search_path;
 
   RETURN var_result;
 END

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

Summary of changes:
 extensions/postgis_extension_helper.sql | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
PostGIS