IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-27 11:10:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix dropping of databases with Unicode names. Fixes #2243

Browse Source 
1. Pickup correct encoding in qtLiteral to decode.
2. While releasing database connection only decode database name if it's not unicode.
This commit is contained in:
Harshal Dhumal 2017-03-17 10:33:03 +00:00 committed by Dave Page
parent 648c332488
commit e4134695e5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/utils/driver/psycopg2/__init__.py
View File

@ -1576,7 +1576,8 @@ WHERE db.oid = {0}""".format(did))
if did is not None: if did is not None:
if did in self.db_info and 'datname' in self.db_info[did]: if did in self.db_info and 'datname' in self.db_info[did]:
database = self.db_info[did]['datname'] database = self.db_info[did]['datname']
if hasattr(str, 'decode'): if hasattr(str, 'decode') and \
not isinstance(database, unicode):
database = database.decode('utf-8') database = database.decode('utf-8')
if database is None: if database is None:
return False return False
@ -1838,10 +1839,7 @@ class Driver(BaseDriver):
# Returns in bytes, we need to convert it in string # Returns in bytes, we need to convert it in string
if isinstance(res, bytes): if isinstance(res, bytes):
try: try:
try: res = res.decode()
res = res.decode()
except UnicodeDecodeError:
res = res.decode(sys.getfilesystemencoding())
except UnicodeDecodeError: except UnicodeDecodeError:
res = res.decode('utf-8') res = res.decode('utf-8')