IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-12-23 15:40:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle connection errors properly in the query tool. Fixes #3528

Browse Source
This commit is contained in:
Akshay Joshi 2018-08-10 13:51:32 +01:00 committed by Dave Page
parent 2eac2f43ac
commit 7b2c1bb9f8
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_3_3.rst
View File

@ -16,3 +16,4 @@ Bug fixes
********* *********
| `Bug #3407 <https://redmine.postgresql.org/issues/3407>`_ - Fix keyboard shortcuts layout in the preferences panel. | `Bug #3407 <https://redmine.postgresql.org/issues/3407>`_ - Fix keyboard shortcuts layout in the preferences panel.
| `Bug #3528 <https://redmine.postgresql.org/issues/3528>`_ - Handle connection errors properly in the query tool.

6
web/pgadmin/tools/datagrid/__init__.py
View File

@ -332,8 +332,12 @@ def initialize_query_tool(sgid, sid, did=None):
use_binary_placeholder=True, use_binary_placeholder=True,
array_to_string=True) array_to_string=True)
if connect: if connect:
conn.connect() status, msg = conn.connect()
if not status:
app.logger.error(msg)
return internal_server_error(errormsg=str(msg))
except (ConnectionLost, SSHTunnelConnectionLost) as e: except (ConnectionLost, SSHTunnelConnectionLost) as e:
app.logger.error(e)
raise raise
except Exception as e: except Exception as e:
app.logger.error(e) app.logger.error(e)

2
web/pgadmin/tools/sqleditor/__init__.py
View File

@ -307,7 +307,7 @@ def start_query_tool(trans_id):
connect = 'connect' in request.args and request.args['connect'] == '1' connect = 'connect' in request.args and request.args['connect'] == '1'
return StartRunningQuery(blueprint, current_app).execute( return StartRunningQuery(blueprint, current_app.logger).execute(
sql, trans_id, session, connect sql, trans_id, session, connect
) )