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

Another try to fix JSON issues.

Browse Source
This commit is contained in:
Khushboo Vashi 2023-02-20 11:21:32 +05:30 committed by GitHub
parent aeb4867bdf
commit b9cbf08b51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,8 @@ class DataTypeJSONEncoder(json.JSONEncoder):
return (datetime.datetime.min + obj).time().isoformat() return (datetime.datetime.min + obj).time().isoformat()
if isinstance(obj, decimal.Decimal): if isinstance(obj, decimal.Decimal):
return float(obj) return float(obj)
if isinstance(obj, bytes):
return obj.decode('utf-8')
try: try:
retval = json.JSONEncoder.default(self, obj) retval = json.JSONEncoder.default(self, obj)
except TypeError: except TypeError:

2
web/pgadmin/utils/driver/psycopg2/connection.py
View File

@ -1987,6 +1987,8 @@ Failed to reset the connection to the server due to following error:
if parameters: if parameters:
mogrified_sql = cursor.mogrify(query, parameters) mogrified_sql = cursor.mogrify(query, parameters)
if isinstance(mogrified_sql, bytes):
mogrified_sql = mogrified_sql.decode(self.python_encoding)
return mogrified_sql return mogrified_sql
else: else:
return query return query