[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-12-g3c6254dde
git at osgeo.org
git at osgeo.org
Sat May 28 22:49:37 PDT 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, master has been updated
via 3c6254dde25ddb90c6a1ce914801a3677dbff48a (commit)
via 301c5ff0cd047b424ae1b6976a5876ba60827097 (commit)
from 111d080211e8bd1b4d9fd27974baabec562d29bd (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 3c6254dde25ddb90c6a1ce914801a3677dbff48a
Author: Regina Obe <lr at pcorp.us>
Date: Sun May 29 01:49:31 2022 -0400
Add manpages enhancement to news
diff --git a/NEWS b/NEWS
index 6a40c9a53..ffbaf04fe 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PostGIS 3.3.0dev
2022/XX/XX
Changes since PostGIS 3.3.0alpha1
* Enhancements *
+ - #5158 pgtopo_import / pgtopo_export manpages
PostGIS 3.3.0alpha1
commit 301c5ff0cd047b424ae1b6976a5876ba60827097
Author: Regina Obe <lr at pcorp.us>
Date: Sun May 29 01:41:47 2022 -0400
More schema qualifications references #5155 for PostGIS 3.3.0
diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index e5546327e..5fa7bde72 100644
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -28,48 +28,48 @@ DECLARE
var_class text := '';
var_is_aggregate boolean := false;
var_sql_list text := '';
- var_pgsql_version integer := current_setting('server_version_num');
+ var_pgsql_version integer := pg_catalog.current_setting('server_version_num');
BEGIN
- var_class := CASE WHEN pg_catalog.lower(param_type) = 'function' OR pg_catalog.lower(param_type) = 'aggregate' THEN 'pg_catalog.pg_proc' ELSE '' END;
- var_is_aggregate := CASE WHEN pg_catalog.lower(param_type) = 'aggregate' THEN true ELSE false END;
+ var_class := CASE WHEN pg_catalog.lower(param_type) OPERATOR(pg_catalog.=)'function' OR pg_catalog.lower(param_type) OPERATOR(pg_catalog.=) 'aggregate' THEN 'pg_catalog.pg_proc' ELSE '' END;
+ var_is_aggregate := CASE WHEN pg_catalog.lower(param_type) OPERATOR(pg_catalog.=) '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,
- cs.typname || ' AS ' || ct.typname || ') ', opcname, opfname) || ';' AS remove_command
+ IF var_pgsql_version OPERATOR(pg_catalog.<) 110000 THEN
+ var_sql_list := $sql$SELECT 'ALTER EXTENSION ' OPERATOR(pg_catalog.||) e.extname OPERATOR(pg_catalog.||) ' DROP ' OPERATOR(pg_catalog.||) $3 OPERATOR(pg_catalog.||) ' ' OPERATOR(pg_catalog.||) COALESCE(proc.proname OPERATOR(pg_catalog.||) '(' OPERATOR(pg_catalog.||) oidvectortypes(proc.proargtypes) OPERATOR(pg_catalog.||) ')' ,typ.typname, cd.relname, op.oprname,
+ cs.typname OPERATOR(pg_catalog.||) ' AS ' OPERATOR(pg_catalog.||) ct.typname OPERATOR(pg_catalog.||) ') ', opcname, opfname) OPERATOR(pg_catalog.||) ';' AS remove_command
FROM pg_catalog.pg_depend As d INNER JOIN pg_catalog.pg_extension As e
- ON d.refobjid = e.oid INNER JOIN pg_catalog.pg_class As c ON
- c.oid = d.classid
- LEFT JOIN pg_catalog.pg_proc AS proc ON proc.oid = d.objid
- LEFT JOIN pg_catalog.pg_type AS typ ON typ.oid = d.objid
- LEFT JOIN pg_catalog.pg_class As cd ON cd.oid = d.objid
- LEFT JOIN pg_operator As op ON op.oid = d.objid
- LEFT JOIN pg_catalog.pg_cast AS ca ON ca.oid = d.objid
- LEFT JOIN pg_catalog.pg_type AS cs ON ca.castsource = cs.oid
- LEFT JOIN pg_catalog.pg_type AS ct ON ca.casttarget = ct.oid
- LEFT JOIN pg_opclass As oc ON oc.oid = d.objid
- LEFT JOIN pg_opfamily As ofa ON ofa.oid = d.objid
- WHERE d.deptype = 'e' and e.extname = $1 and c.relname = $2 AND COALESCE(proc.proisagg, false) = $4;$sql$;
+ ON d.refobjid OPERATOR(pg_catalog.=) e.oid INNER JOIN pg_catalog.pg_class As c ON
+ c.oid OPERATOR(pg_catalog.=) d.classid
+ LEFT JOIN pg_catalog.pg_proc AS proc ON proc.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_type AS typ ON typ.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_class As cd ON cd.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_operator As op ON op.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_cast AS ca ON ca.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_type AS cs ON ca.castsource OPERATOR(pg_catalog.=) cs.oid
+ LEFT JOIN pg_catalog.pg_type AS ct ON ca.casttarget OPERATOR(pg_catalog.=) ct.oid
+ LEFT JOIN pg_opclass As oc ON oc.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_opfamily As ofa ON ofa.oid OPERATOR(pg_catalog.=) d.objid
+ WHERE d.deptype OPERATOR(pg_catalog.=) 'e' and e.extname OPERATOR(pg_catalog.=) $1 and c.relname OPERATOR(pg_catalog.=) $2 AND COALESCE(proc.proisagg, false) OPERATOR(pg_catalog.=) $4;$sql$;
ELSE -- for PostgreSQL 11 and above, they removed proc.proisagg among others and replaced with some func type thing
- var_sql_list := $sql$SELECT 'ALTER EXTENSION ' || e.extname || ' DROP ' || $3 || ' ' || COALESCE(proc.proname || '(' || oidvectortypes(proc.proargtypes) || ')' ,typ.typname, cd.relname, op.oprname,
- cs.typname || ' AS ' || ct.typname || ') ', opcname, opfname) || ';' AS remove_command
+ var_sql_list := $sql$SELECT 'ALTER EXTENSION ' OPERATOR(pg_catalog.||) e.extname OPERATOR(pg_catalog.||) ' DROP ' OPERATOR(pg_catalog.||) $3 OPERATOR(pg_catalog.||) ' ' OPERATOR(pg_catalog.||) COALESCE(proc.proname OPERATOR(pg_catalog.||) '(' OPERATOR(pg_catalog.||) oidvectortypes(proc.proargtypes) OPERATOR(pg_catalog.||) ')' ,typ.typname, cd.relname, op.oprname,
+ cs.typname OPERATOR(pg_catalog.||) ' AS ' OPERATOR(pg_catalog.||) ct.typname OPERATOR(pg_catalog.||) ') ', opcname, opfname) OPERATOR(pg_catalog.||) ';' AS remove_command
FROM pg_catalog.pg_depend As d INNER JOIN pg_catalog.pg_extension As e
- ON d.refobjid = e.oid INNER JOIN pg_catalog.pg_class As c ON
- c.oid = d.classid
- LEFT JOIN pg_catalog.pg_proc AS proc ON proc.oid = d.objid
- LEFT JOIN pg_catalog.pg_type AS typ ON typ.oid = d.objid
- LEFT JOIN pg_catalog.pg_class As cd ON cd.oid = d.objid
- LEFT JOIN pg_operator As op ON op.oid = d.objid
- LEFT JOIN pg_catalog.pg_cast AS ca ON ca.oid = d.objid
- LEFT JOIN pg_catalog.pg_type AS cs ON ca.castsource = cs.oid
- LEFT JOIN pg_catalog.pg_type AS ct ON ca.casttarget = ct.oid
- LEFT JOIN pg_opclass As oc ON oc.oid = d.objid
- LEFT JOIN pg_opfamily As ofa ON ofa.oid = d.objid
- WHERE d.deptype = 'e' and e.extname = $1 and c.relname = $2 AND (proc.prokind = 'a') = $4;$sql$;
+ ON d.refobjid OPERATOR(pg_catalog.=) e.oid INNER JOIN pg_catalog.pg_class As c ON
+ c.oid OPERATOR(pg_catalog.=) d.classid
+ LEFT JOIN pg_catalog.pg_proc AS proc ON proc.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_type AS typ ON typ.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_class As cd ON cd.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_operator As op ON op.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_cast AS ca ON ca.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_catalog.pg_type AS cs ON ca.castsource OPERATOR(pg_catalog.=) cs.oid
+ LEFT JOIN pg_catalog.pg_type AS ct ON ca.casttarget OPERATOR(pg_catalog.=) ct.oid
+ LEFT JOIN pg_opclass As oc ON oc.oid OPERATOR(pg_catalog.=) d.objid
+ LEFT JOIN pg_opfamily As ofa ON ofa.oid OPERATOR(pg_catalog.=) d.objid
+ WHERE d.deptype OPERATOR(pg_catalog.=) 'e' and e.extname OPERATOR(pg_catalog.=) $1 and c.relname OPERATOR(pg_catalog.=) $2 AND (proc.prokind OPERATOR(pg_catalog.=) 'a') OPERATOR(pg_catalog.=) $4;$sql$;
END IF;
FOR var_r IN EXECUTE var_sql_list USING param_extension, var_class, param_type, var_is_aggregate
LOOP
- var_sql := var_sql || var_r.remove_command || ';';
+ var_sql := var_sql OPERATOR(pg_catalog.||) var_r.remove_command OPERATOR(pg_catalog.||) ';';
END LOOP;
IF var_sql > '' THEN
EXECUTE var_sql;
@@ -85,7 +85,7 @@ CREATE FUNCTION postgis_extension_drop_if_exists(param_extension text, param_sta
RETURNS boolean AS
$$
DECLARE
- var_sql_ext text := 'ALTER EXTENSION ' || pg_catalog.quote_ident(param_extension) || ' ' || pg_catalog.replace(param_statement, 'IF EXISTS', '');
+ var_sql_ext text := 'ALTER EXTENSION ' OPERATOR(pg_catalog.||) pg_catalog.quote_ident(param_extension) OPERATOR(pg_catalog.||) ' ' OPERATOR(pg_catalog.||) pg_catalog.replace(param_statement, 'IF EXISTS', '');
var_result boolean := false;
BEGIN
BEGIN
@@ -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,23 +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:
NEWS | 1 +
extensions/postgis_extension_helper.sql | 92 ++++++++++++++++-----------------
2 files changed, 47 insertions(+), 46 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list