[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0beta2-24-g4838f1843
git at osgeo.org
git at osgeo.org
Sat Aug 5 14:42:35 PDT 2023
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 4838f18435a62d337f29ce5575477a461477ae16 (commit)
via f56fb33186a953082071d752c09c5c0a1f9034e2 (commit)
via 5620f2bf7afbf411cb567406945981eea13cd176 (commit)
from af3e63085419434590f2d52963ca89105e52492f (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 4838f18435a62d337f29ce5575477a461477ae16
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 5 17:41:14 2023 -0400
Credits for #5442
References https://git.osgeo.org/gitea/postgis/postgis/pulls/134
diff --git a/NEWS b/NEWS
index 64d213258..aa11c066f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
PostGIS 3.4.0rc1
-2023/xx/xx
+2023/08/05
+
+Changes since 3.4.0beta2 release
+
+ - #5442, [postgis_tiger_geocoder,postgis_topology]
+ Database search_path does not do
+ what it intends to do (Jelte Fennema)
PostGIS 3.4.0beta2
2023/07/29
diff --git a/doc/introduction.xml b/doc/introduction.xml
index 97d1ff783..b487787d0 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -266,6 +266,7 @@
<member>Jan Katins</member>
<member>Jason Smith</member>
<member>Jeff Adams</member>
+ <member>Jelte Fennema</member>
<member>Jim Jones</member>
<member>Joe Conway</member>
<member>Jonne Savolainen</member>
commit f56fb33186a953082071d752c09c5c0a1f9034e2
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 5 17:31:51 2023 -0400
Remove more uncommon language builds
References #5466 for PostGIS 3.4.0
diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml
index c0dd942c5..ef09eacaf 100644
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@@ -361,52 +361,52 @@ steps:
# Internationalization Makefiles
- "doc/po/Makefile.local"
# END OF COMMON PATHS
- html-es:
- image: *test_image
- commands:
- - make -C build-docs/doc/po/es local-html
- group: localized-html
- when:
- path:
- include:
- # Localized assets
- - "doc/po/es/Makefile.in"
- - "doc/po/es/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
- html-pl:
- image: *test_image
- commands:
- - make -C build-docs/doc/po/pl local-html
- group: localized-html
- when:
- path:
- include:
- # Localized assets
- - "doc/po/pl/Makefile.in"
- - "doc/po/pl/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
+ # html-es:
+ # image: *test_image
+ # commands:
+ # - make -C build-docs/doc/po/es local-html
+ # group: localized-html
+ # when:
+ # path:
+ # include:
+ # # Localized assets
+ # - "doc/po/es/Makefile.in"
+ # - "doc/po/es/*.po"
+ # - "utils/check_localized_cheatsheets.sh"
+ # # Common docs path
+ # # related config files
+ # - ".woodpecker/docs.yml"
+ # # Makefiles
+ # - "doc/Makefile.in"
+ # - "doc/html/images/Makefile.in"
+ # # XML sources
+ # - "doc/*.xml"
+ # # Internationalization Makefiles
+ # - "doc/po/Makefile.local"
+ # # END OF COMMON PATHS
+ # html-pl:
+ # image: *test_image
+ # commands:
+ # - make -C build-docs/doc/po/pl local-html
+ # group: localized-html
+ # when:
+ # path:
+ # include:
+ # # Localized assets
+ # - "doc/po/pl/Makefile.in"
+ # - "doc/po/pl/*.po"
+ # - "utils/check_localized_cheatsheets.sh"
+ # # Common docs path
+ # # related config files
+ # - ".woodpecker/docs.yml"
+ # # Makefiles
+ # - "doc/Makefile.in"
+ # - "doc/html/images/Makefile.in"
+ # # XML sources
+ # - "doc/*.xml"
+ # # Internationalization Makefiles
+ # - "doc/po/Makefile.local"
+ # # END OF COMMON PATHS
html-ko_KR:
image: *test_image
commands:
@@ -476,29 +476,29 @@ steps:
# Internationalization Makefiles
- "doc/po/Makefile.local"
# END OF COMMON PATHS
- html-ru:
- image: *test_image
- commands:
- - make -C build-docs/doc/po/ru local-html
- group: localized-html
- when:
- path:
- include:
- # Localized assets
- - "doc/po/ru/Makefile.in"
- - "doc/po/ru/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
+ # html-ru:
+ # image: *test_image
+ # commands:
+ # - make -C build-docs/doc/po/ru local-html
+ # group: localized-html
+ # when:
+ # path:
+ # include:
+ # # Localized assets
+ # - "doc/po/ru/Makefile.in"
+ # - "doc/po/ru/*.po"
+ # - "utils/check_localized_cheatsheets.sh"
+ # # Common docs path
+ # # related config files
+ # - ".woodpecker/docs.yml"
+ # # Makefiles
+ # - "doc/Makefile.in"
+ # - "doc/html/images/Makefile.in"
+ # # XML sources
+ # - "doc/*.xml"
+ # # Internationalization Makefiles
+ # - "doc/po/Makefile.local"
+ # # END OF COMMON PATHS
### TARGET cheatsheets
cheatsheets-it_IT:
image: *test_image
@@ -592,29 +592,29 @@ steps:
# Internationalization Makefiles
- "doc/po/Makefile.local"
# END OF COMMON PATHS
- cheatsheets-pl:
- image: *test_image
- commands:
- - make -C build-docs/doc/po/pl local-cheatsheets
- group: localized-cheatsheets
- when:
- path:
- include:
- # Localized assets
- - "doc/po/pl/Makefile.in"
- - "doc/po/pl/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
+ # cheatsheets-pl:
+ # image: *test_image
+ # commands:
+ # - make -C build-docs/doc/po/pl local-cheatsheets
+ # group: localized-cheatsheets
+ # when:
+ # path:
+ # include:
+ # # Localized assets
+ # - "doc/po/pl/Makefile.in"
+ # - "doc/po/pl/*.po"
+ # - "utils/check_localized_cheatsheets.sh"
+ # # Common docs path
+ # # related config files
+ # - ".woodpecker/docs.yml"
+ # # Makefiles
+ # - "doc/Makefile.in"
+ # - "doc/html/images/Makefile.in"
+ # # XML sources
+ # - "doc/*.xml"
+ # # Internationalization Makefiles
+ # - "doc/po/Makefile.local"
+ # # END OF COMMON PATHS
cheatsheets-ko_KR:
image: *test_image
commands:
@@ -985,29 +985,29 @@ steps:
# Internationalization Makefiles
- "doc/po/Makefile.local"
# END OF COMMON PATHS
- pdf-es:
- image: *test_image
- commands:
- - make -C build-docs/doc/po/es local-pdf
- group: localized-pdf
- when:
- path:
- include:
- # Localized assets
- - "doc/po/es/Makefile.in"
- - "doc/po/es/*.po"
- - "utils/check_localized_cheatsheets.sh"
- # Common docs path
- # related config files
- - ".woodpecker/docs.yml"
- # Makefiles
- - "doc/Makefile.in"
- - "doc/html/images/Makefile.in"
- # XML sources
- - "doc/*.xml"
- # Internationalization Makefiles
- - "doc/po/Makefile.local"
- # END OF COMMON PATHS
+ # pdf-es:
+ # image: *test_image
+ # commands:
+ # - make -C build-docs/doc/po/es local-pdf
+ # group: localized-pdf
+ # when:
+ # path:
+ # include:
+ # # Localized assets
+ # - "doc/po/es/Makefile.in"
+ # - "doc/po/es/*.po"
+ # - "utils/check_localized_cheatsheets.sh"
+ # # Common docs path
+ # # related config files
+ # - ".woodpecker/docs.yml"
+ # # Makefiles
+ # - "doc/Makefile.in"
+ # - "doc/html/images/Makefile.in"
+ # # XML sources
+ # - "doc/*.xml"
+ # # Internationalization Makefiles
+ # - "doc/po/Makefile.local"
+ # # END OF COMMON PATHS
# pdf-pl:
# image: *test_image
# commands:
commit 5620f2bf7afbf411cb567406945981eea13cd176
Author: Jelte Fennema <github-tech at jeltef.nl>
Date: Fri Jul 14 12:37:52 2023 +0200
Fix add to search_path
diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index 5fa7bde72..a984ecb92 100644
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -126,7 +126,16 @@ BEGIN
RAISE NOTICE 'cur_search_path from pg_db_role_setting is %', var_cur_search_path;
IF var_cur_search_path IS NULL THEN
- SELECT reset_val
+ SELECT setting
+ INTO var_cur_search_path
+ FROM pg_catalog.pg_file_settings
+ WHERE name OPERATOR(pg_catalog.=) 'search_path' AND applied;
+
+ RAISE NOTICE 'cur_search_path from pg_file_settings is %', var_cur_search_path;
+ END IF;
+
+ IF var_cur_search_path IS NULL THEN
+ SELECT boot_val
INTO var_cur_search_path
FROM pg_catalog.pg_settings
WHERE name OPERATOR(pg_catalog.=) 'search_path';
@@ -134,7 +143,6 @@ BEGIN
RAISE NOTICE 'cur_search_path from pg_settings is %', var_cur_search_path;
END IF;
-
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
diff --git a/topology/sql/manage/ManageHelper.sql.in b/topology/sql/manage/ManageHelper.sql.in
index 2acfd9c41..eb9da2d02 100644
--- a/topology/sql/manage/ManageHelper.sql.in
+++ b/topology/sql/manage/ManageHelper.sql.in
@@ -25,18 +25,50 @@ DECLARE
var_result text;
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 '%' || pg_catalog.quote_ident(a_schema_name) || '%' THEN
- var_result := a_schema_name || ' already in database search_path';
+ WITH settings AS (
+ SELECT pg_catalog.unnest(setconfig) config
+ FROM pg_catalog.pg_db_role_setting
+ WHERE setdatabase OPERATOR(pg_catalog.=) (
+ SELECT oid
+ FROM pg_catalog.pg_database
+ 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=%'
+ INTO var_cur_search_path;
+
+ RAISE NOTICE 'cur_search_path from pg_db_role_setting is %', var_cur_search_path;
+
+ IF var_cur_search_path IS NULL THEN
+ SELECT setting
+ INTO var_cur_search_path
+ FROM pg_catalog.pg_file_settings
+ WHERE name OPERATOR(pg_catalog.=) 'search_path' AND applied;
+
+ RAISE NOTICE 'cur_search_path from pg_file_settings is %', var_cur_search_path;
+ END IF;
+
+ IF var_cur_search_path IS NULL THEN
+ SELECT boot_val
+ INTO var_cur_search_path
+ FROM pg_catalog.pg_settings
+ 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 '%' 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:
.woodpecker/docs.yml | 230 ++++++++++++++++----------------
NEWS | 8 +-
doc/introduction.xml | 1 +
extensions/postgis_extension_helper.sql | 12 +-
topology/sql/manage/ManageHelper.sql.in | 50 +++++--
5 files changed, 174 insertions(+), 127 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list