IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 23:15:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an error in the collation create script for PG-15. #5606

Browse Source
This commit is contained in:
Akshay Joshi 2022-12-06 12:50:09 +05:30
parent 5465842af0
commit cddb24bc50
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_6_18.rst
View File

@ -27,3 +27,4 @@ Bug fixes
| `Issue #5453 <https://github.com/pgadmin-org/pgadmin4/issues/5453>`_ - Fixed an issue where Transaction IDs were not found in session in the Query Tool.
| `Issue #5564 <https://github.com/pgadmin-org/pgadmin4/issues/5564>`_ - Ensure that table statistics are sorted by size.
| `Issue #5603 <https://github.com/pgadmin-org/pgadmin4/issues/5603>`_ - Fixed an issue where master password was not set correctly with external config database.
| `Issue #5606 <https://github.com/pgadmin-org/pgadmin4/issues/5606>`_ - Fixed an error in the collation create script for PG-15.

9
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/15_plus/properties.sql Normal file
View File

@ -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;

3
web/pgadmin/utils/versioned_template_loader.py
View File

@ -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},