From efb077b7f77f6313bb4b67aa3ffb27a65e296330 Mon Sep 17 00:00:00 2001
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Fri, 31 Mar 2017 20:06:55 -0400
Subject: [PATCH] Fix error highlighting in the query tool. Fixes #2291

---
 web/pgadmin/tools/sqleditor/__init__.py                     | 6 ++++--
 .../tools/sqleditor/templates/sqleditor/js/sqleditor.js     | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index f08b02e7e..044437720 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -481,8 +481,10 @@ def poll(trans_id):
     # Check the transaction and connection status
     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:
-        status, result = conn.poll()
-        if status == ASYNC_OK:
+        status, result = conn.poll(formatted_exception_msg=True)
+        if not status:
+            return internal_server_error(result)
+        elif status == ASYNC_OK:
             status = 'Success'
             rows_affected = conn.rows_affected()
 
diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
index eed0e0964..1bda06798 100644
--- a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
@@ -1843,6 +1843,8 @@ define(
                     msg = e.responseJSON.errormsg;
 
                   self.update_msg_history(false, msg);
+                  // Highlight the error in the sql panel
+                  self._highlight_error(msg);
                 }
               });
           }, self.POLL_FALLBACK_TIME());