Skip to content

Fix collation/ctype query error for non-default LC_COLLATE (#9798) #10040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpage wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −16
Open

Fix collation/ctype query error for non-default LC_COLLATE (#9798) #10040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/en_US/release_notes_9_16.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ Housekeeping

Bug fixes
*********

| `Issue #9798 <https://github.com/pgadmin-org/pgadmin4/issues/9798>`_ - Fixed an issue where editing or creating a database with a non-default LC_COLLATE/LC_CTYPE (e.g. LC_COLLATE=C) failed with "more than one row returned by a subquery", locking the collation/ctype inputs.
16 changes: 8 additions & 8 deletions ...in/browser/server_groups/servers/databases/templates/databases/sql/16_plus/get_ctypes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SELECT CASE WHEN datlocprovider = 'i' THEN
(SELECT daticulocale as cname FROM pg_catalog.pg_database WHERE datname = current_database())
ELSE
(SELECT datcollate as cname FROM pg_catalog.pg_database WHERE datname = current_database()
UNION
SELECT datctype as cname FROM pg_catalog.pg_database WHERE datname = current_database())
END
FROM pg_catalog.pg_database WHERE datname = current_database();
SELECT daticulocale AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider = 'i'
UNION
SELECT datcollate AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider <> 'i'
UNION
SELECT datctype AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider <> 'i';
16 changes: 8 additions & 8 deletions ...in/browser/server_groups/servers/databases/templates/databases/sql/17_plus/get_ctypes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SELECT CASE WHEN datlocprovider = 'i' THEN
(SELECT datlocale as cname FROM pg_catalog.pg_database WHERE datname = current_database())
ELSE
(SELECT datcollate as cname FROM pg_catalog.pg_database WHERE datname = current_database()
UNION
SELECT datctype as cname FROM pg_catalog.pg_database WHERE datname = current_database())
END
FROM pg_catalog.pg_database WHERE datname = current_database();
SELECT datlocale AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider = 'i'
UNION
SELECT datcollate AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider <> 'i'
UNION
SELECT datctype AS cname FROM pg_catalog.pg_database
WHERE datname = current_database() AND datlocprovider <> 'i';
Loading