IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the UNICODE encoding issue while connecting through Pgbouncer after upgrading from 6.21 to 7.1 #6340.

Browse Source
This commit is contained in:
Khushboo Vashi 2023-06-09 16:24:05 +05:30
parent 07fa09f3c7
commit a5b5ede8fd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/utils/driver/psycopg3/encoding.py
View File

@ -10,6 +10,7 @@
# Get Postgres and Python encoding # Get Postgres and Python encoding
import psycopg import psycopg
from flask import current_app
encode_dict = { encode_dict = {
'SQL_ASCII': ['SQL_ASCII', 'raw-unicode-escape'], 'SQL_ASCII': ['SQL_ASCII', 'raw-unicode-escape'],
@ -33,7 +34,12 @@ def get_encoding(key):
# #
if key == 'ascii': if key == 'ascii':
key = 'raw_unicode_escape' key = 'raw_unicode_escape'
postgres_encoding = psycopg._encodings.py2pgenc(key).decode() try:
postgres_encoding = psycopg._encodings.py2pgenc(key).decode()
except Exception as e:
# For unsupported encodings by psycopg like UNICODE
current_app.logger.error(e)
postgres_encoding = 'utf-8'
python_encoding = psycopg._encodings._py_codecs.get(postgres_encoding, python_encoding = psycopg._encodings._py_codecs.get(postgres_encoding,
'utf-8') 'utf-8')