pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverted changes for formatted exception message. #8165

dependabot/npm_and_yarn/web/react-leaflet-5.0.0
Akshay Joshi 2025-01-06 17:46:34 +05:30
parent 1934a75eee
commit 8c461ffb86
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
web/pgadmin/utils/driver/psycopg3/connection.py
View File

@ -1675,23 +1675,27 @@ Failed to reset the connection to the server due to following error:
message message
""" """
if hasattr(exception_obj, 'pgerror'):
errmsg = exception_obj.pgerror
elif hasattr(exception_obj, 'diag') and \
hasattr(exception_obj.diag, 'message_detail') and\
exception_obj.diag.message_detail is not None:
errmsg = exception_obj.diag.message_primary + '\n' + \
exception_obj.diag.message_detail
else:
errmsg = str(exception_obj)
# if formatted_msg is false then return from the function # if formatted_msg is false then return from the function
if not formatted_msg: if not formatted_msg:
if hasattr(exception_obj, 'pgerror'):
errmsg = exception_obj.pgerror
elif hasattr(exception_obj, 'diag') and \
hasattr(exception_obj.diag, 'message_detail') and\
exception_obj.diag.message_detail is not None:
errmsg = (exception_obj.diag.message_primary + '\n' +
exception_obj.diag.message_detail)
else:
errmsg = str(exception_obj)
notices = self.get_notices() notices = self.get_notices()
errmsg = errmsg.replace('\n', '<br/>') errmsg = errmsg.replace('\n', '<br/>')
return errmsg if notices == '' else notices + '\n' + errmsg return errmsg if notices == '' else notices + '\n' + errmsg
errmsg = '' # Do not append if error starts with `ERROR:` as most pg related
# error starts with `ERROR:`
if not errmsg.startswith('ERROR:'):
errmsg = gettext('ERROR: ') + errmsg + ' \n\n'
if exception_obj.diag.severity is not None \ if exception_obj.diag.severity is not None \
and exception_obj.diag.message_primary is not None: and exception_obj.diag.message_primary is not None:
ex_diag_message = "{0}: {1}".format( ex_diag_message = "{0}: {1}".format(
@ -1714,25 +1718,29 @@ Failed to reset the connection to the server due to following error:
errmsg += gettext('SQL state: ') errmsg += gettext('SQL state: ')
errmsg += exception_obj.diag.sqlstate errmsg += exception_obj.diag.sqlstate
if exception_obj.diag.message_detail is not None: if exception_obj.diag.message_detail is not None and \
'Detail:'.lower() not in errmsg.lower():
if not errmsg.endswith('\n'): if not errmsg.endswith('\n'):
errmsg += '\n' errmsg += '\n'
errmsg += gettext('Detail: ') errmsg += gettext('Detail: ')
errmsg += exception_obj.diag.message_detail errmsg += exception_obj.diag.message_detail
if exception_obj.diag.message_hint is not None: if exception_obj.diag.message_hint is not None and \
'Hint:'.lower() not in errmsg.lower():
if not errmsg.endswith('\n'): if not errmsg.endswith('\n'):
errmsg += '\n' errmsg += '\n'
errmsg += gettext('Hint: ') errmsg += gettext('Hint: ')
errmsg += exception_obj.diag.message_hint errmsg += exception_obj.diag.message_hint
if exception_obj.diag.statement_position is not None: if exception_obj.diag.statement_position is not None and \
'Character:'.lower() not in errmsg.lower():
if not errmsg.endswith('\n'): if not errmsg.endswith('\n'):
errmsg += '\n' errmsg += '\n'
errmsg += gettext('Character: ') errmsg += gettext('Character: ')
errmsg += exception_obj.diag.statement_position errmsg += exception_obj.diag.statement_position
if exception_obj.diag.context is not None: if exception_obj.diag.context is not None and \
'Context:'.lower() not in errmsg.lower():
if not errmsg.endswith('\n'): if not errmsg.endswith('\n'):
errmsg += '\n' errmsg += '\n'
errmsg += gettext('Context: ') errmsg += gettext('Context: ')