[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.4-27-g2d3e08b93
git at osgeo.org
git at osgeo.org
Mon Jan 31 21:24:24 PST 2022
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 2d3e08b932441173069ccc2e99a8e689f740cfce (commit)
from e3921ac43be7beb497dd44be910c16687e84481b (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 2d3e08b932441173069ccc2e99a8e689f740cfce
Author: Regina Obe <lr at pcorp.us>
Date: Tue Feb 1 00:18:37 2022 -0500
More missed spots. References #5069 for PostGIS 3.1.5
diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index 35cc7723f..aa0713407 100644
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -30,8 +30,8 @@ DECLARE
var_sql_list text := '';
var_pgsql_version integer := pg_catalog.current_setting('server_version_num');
BEGIN
- var_class := CASE WHEN lower(param_type) = 'function' OR lower(param_type) = 'aggregate' THEN 'pg_proc' ELSE '' END;
- var_is_aggregate := CASE WHEN lower(param_type) = 'aggregate' THEN true ELSE false END;
+ var_class := CASE WHEN pg_catalog.lower(param_type) = 'function' OR pg_catalog.lower(param_type) = 'aggregate' THEN 'pg_proc' ELSE '' END;
+ var_is_aggregate := CASE WHEN pg_catalog.lower(param_type) = 'aggregate' THEN true ELSE false END;
IF var_pgsql_version < 110000 THEN
var_sql_list := $sql$SELECT 'ALTER EXTENSION ' || e.extname || ' DROP ' || $3 || ' ' || COALESCE(proc.proname || '(' || oidvectortypes(proc.proargtypes) || ')' ,typ.typname, cd.relname, op.oprname,
@@ -115,7 +115,7 @@ BEGIN
ELSE
var_cur_search_path := var_cur_search_path || ', '
|| pg_catalog.quote_ident(a_schema_name);
- EXECUTE 'ALTER DATABASE ' || pg_catalog.quote_ident(current_database())
+ 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 ';
END IF;
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 9d235f0a0..181cbeae3 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -29,7 +29,7 @@ DO $$
DECLARE
pgver text;
BEGIN
- SELECT pg_catalog.substring(version(), 'PostgreSQL ([0-9\.]+)') INTO pgver;
+ SELECT pg_catalog.substring(pg_catalog.version(), '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(version(), 'PostgreSQL ([0-9\.]+)') AS s )
+ FROM pg_catalog.substring(pg_catalog.version(), 'PostgreSQL ([0-9\.]+)') AS s )
THEN
RAISE EXCEPTION 'PostGIS built for PostgreSQL % cannot be loaded in PostgreSQL %',
POSTGIS_PGSQL_HR_VERSION, pgver;
diff --git a/postgis/postgis_before_upgrade.sql b/postgis/postgis_before_upgrade.sql
index a9a61c785..5192032b4 100644
--- a/postgis/postgis_before_upgrade.sql
+++ b/postgis/postgis_before_upgrade.sql
@@ -30,8 +30,8 @@
-- FROM pg_catalog.pg_proc p
-- LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace
-- WHERE
--- LOWER(n.nspname) = LOWER('public') AND
--- LOWER(p.proname) = LOWER('ST_AsGeoJson')
+-- pg_catalog.LOWER(n.nspname) = pg_catalog.LOWER('public') AND
+-- pg_catalog.LOWER(p.proname) = pg_catalog.LOWER('ST_AsGeoJson')
-- ORDER BY 1, 2, 3, 4;
CREATE OR REPLACE FUNCTION _postgis_drop_function_if_needed(
function_name text,
diff --git a/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in b/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in
index 08e787699..e31d74f76 100644
--- a/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in
+++ b/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in
@@ -94,7 +94,7 @@ BEGIN
IF NOT EXISTS (
SELECT
proname
- FROM pg_proc f
+ FROM pg_catalog.pg_proc f
JOIN pg_catalog.pg_type r
ON r.typname = 'raster'
AND (f.proargtypes::oid[])[0] = r.oid
@@ -117,7 +117,7 @@ BEGIN
IF NOT EXISTS (
SELECT
proname
- FROM pg_proc f
+ FROM pg_catalog.pg_proc f
JOIN pg_catalog.pg_type r
ON r.typname = 'raster'
AND (f.proargtypes::oid[])[1] = r.oid
@@ -417,8 +417,8 @@ CREATE OR REPLACE FUNCTION _drop_st_samealignment()
cnt int;
BEGIN
SELECT count(*) INTO cnt
- FROM pg_proc
- WHERE lower(proname) = 'st_samealignment'
+ FROM pg_catalog.pg_proc
+ WHERE pg_catalog.lower(proname) = 'st_samealignment'
AND pronargs = 2
AND (
proargnames = '{rasta,rastb}'::text[] OR
@@ -586,10 +586,10 @@ BEGIN
SELECT
count(*)
INTO cnt
- FROM pg_proc f
+ FROM pg_catalog.pg_proc f
JOIN pg_catalog.pg_type t
ON f.prorettype = t.oid
- WHERE lower(f.proname) = '_raster_constraint_nodata_values'
+ WHERE pg_catalog.lower(f.proname) = '_raster_constraint_nodata_values'
AND f.pronargs = 1
AND t.typname = '_float8'; -- array form
diff --git a/topology/sql/manage/ManageHelper.sql.in b/topology/sql/manage/ManageHelper.sql.in
index 6fdcae2ae..53679fc3e 100644
--- a/topology/sql/manage/ManageHelper.sql.in
+++ b/topology/sql/manage/ManageHelper.sql.in
@@ -26,12 +26,12 @@ DECLARE
var_cur_search_path text;
BEGIN
SELECT reset_val INTO var_cur_search_path FROM pg_catalog.pg_settings WHERE name = 'search_path';
- IF var_cur_search_path LIKE '%' || quote_ident(a_schema_name) || '%' THEN
+ IF var_cur_search_path LIKE '%' || pg_catalog.quote_ident(a_schema_name) || '%' THEN
var_result := a_schema_name || ' already in database search_path';
ELSE
var_cur_search_path := var_cur_search_path || ', '
- || quote_ident(a_schema_name);
- EXECUTE 'ALTER DATABASE ' || quote_ident(current_database())
+ || pg_catalog.quote_ident(a_schema_name);
+ EXECUTE 'ALTER DATABASE ' || pg_catalog.quote_ident(current_database())
|| ' SET search_path = ' || var_cur_search_path;
var_result := a_schema_name || ' has been added to end of database search_path ';
END IF;
diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl
index d0047fdb9..7e5ee93b7 100755
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/postgis_proc_upgrade.pl
@@ -244,8 +244,8 @@ BEGIN
FOR rec IN
SELECT e.extname
FROM
- pg_extension e,
- pg_depend d
+ pg_catalog.pg_extension e,
+ pg_catalog.pg_depend d
WHERE
d.refclassid = 'pg_catalog.pg_extension'::pg_catalog.regclass AND
d.refobjid = e.oid AND
-----------------------------------------------------------------------
Summary of changes:
extensions/postgis_extension_helper.sql | 6 +++---
postgis/postgis.sql.in | 4 ++--
postgis/postgis_before_upgrade.sql | 4 ++--
raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in | 12 ++++++------
topology/sql/manage/ManageHelper.sql.in | 6 +++---
utils/postgis_proc_upgrade.pl | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list