From cddb24bc50515621de97c75b16e2877f0356885c Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Tue, 6 Dec 2022 12:50:09 +0530 Subject: [PATCH] Fixed an error in the collation create script for PG-15. #5606 --- docs/en_US/release_notes_6_18.rst | 1 + .../templates/collations/sql/15_plus/properties.sql | 9 +++++++++ web/pgadmin/utils/versioned_template_loader.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/15_plus/properties.sql diff --git a/docs/en_US/release_notes_6_18.rst b/docs/en_US/release_notes_6_18.rst index 9b7f9c5fd..a3d620e11 100644 --- a/docs/en_US/release_notes_6_18.rst +++ b/docs/en_US/release_notes_6_18.rst @@ -27,3 +27,4 @@ Bug fixes | `Issue #5453 `_ - Fixed an issue where Transaction IDs were not found in session in the Query Tool. | `Issue #5564 `_ - Ensure that table statistics are sorted by size. | `Issue #5603 `_ - Fixed an issue where master password was not set correctly with external config database. + | `Issue #5606 `_ - Fixed an error in the collation create script for PG-15. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/15_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/15_plus/properties.sql new file mode 100644 index 000000000..dbe95b4ba --- /dev/null +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/15_plus/properties.sql @@ -0,0 +1,9 @@ +SELECT c.oid, c.collname AS name, COALESCE(c.collcollate, c.colliculocale) AS lc_collate, + COALESCE(c.collctype, c.colliculocale) AS lc_type, + pg_catalog.pg_get_userbyid(c.collowner) AS owner, description, n.nspname AS schema +FROM pg_catalog.pg_collation c + JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace + LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid AND des.classoid='pg_collation'::regclass) +WHERE c.collnamespace = {{scid}}::oid +{% if coid %} AND c.oid = {{coid}}::oid {% endif %} +ORDER BY c.collname; diff --git a/web/pgadmin/utils/versioned_template_loader.py b/web/pgadmin/utils/versioned_template_loader.py index 3de4c482c..4c124eff2 100644 --- a/web/pgadmin/utils/versioned_template_loader.py +++ b/web/pgadmin/utils/versioned_template_loader.py @@ -76,7 +76,8 @@ def get_version_mapping_directories(): :param server_type: :return: """ - return ({'name': "14_plus", 'number': 140000}, + return ({'name': "15_plus", 'number': 150000}, + {'name': "14_plus", 'number': 140000}, {'name': "13_plus", 'number': 130000}, {'name': "12_plus", 'number': 120000}, {'name': "11_plus", 'number': 110000},