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 error highlighting in the query tool. Fixes #2291

Browse Source
This commit is contained in:
Khushboo Vashi 2017-03-31 20:06:55 -04:00 committed by Dave Page
parent a4fd313371
commit efb077b7f7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,8 +481,10 @@ def poll(trans_id):
# Check the transaction and connection status # Check the transaction and connection status
status, error_msg, conn, trans_obj, session_obj = check_transaction_status(trans_id) status, error_msg, conn, trans_obj, session_obj = check_transaction_status(trans_id)
if status and conn is not None and session_obj is not None: if status and conn is not None and session_obj is not None:
status, result = conn.poll() status, result = conn.poll(formatted_exception_msg=True)
if status == ASYNC_OK: if not status:
return internal_server_error(result)
elif status == ASYNC_OK:
status = 'Success' status = 'Success'
rows_affected = conn.rows_affected() rows_affected = conn.rows_affected()

2
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -1843,6 +1843,8 @@ define(
msg = e.responseJSON.errormsg; msg = e.responseJSON.errormsg;
self.update_msg_history(false, msg); self.update_msg_history(false, msg);
// Highlight the error in the sql panel
self._highlight_error(msg);
} }
}); });
}, self.POLL_FALLBACK_TIME()); }, self.POLL_FALLBACK_TIME());