Merge pull request #901 from benchling/fix-reconnect

Avoid reconnect prompt after error if connection is still valid

3 files changed, 7 insertions, 10 deletions

diff --git a/AUTHORS b/AUTHORS
index d9631d64..12d33c99 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -81,6 +81,7 @@ Contributors:
     * Rishi Ramraj
     * Matthieu Guilbert
     * Alexandr Korsak
+    * Saif Hakim
 
 
 Creator:
diff --git a/changelog.rst b/changelog.rst
index 266b6a69..5dd8512a 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -20,7 +20,7 @@ Internal changes:
 Bug Fixes:
 ----------
 * Disable pager when using \watch (#837). (Thanks: `Jason Ribeiro`_)
-* Don't offer to reconnect when we can't change a param in realtime (#807). (Thanks: `Amjith Ramanujam`_)
+* Don't offer to reconnect when we can't change a param in realtime (#807). (Thanks: `Amjith Ramanujam`_ and `Saif Hakim`_)
 * Make keyring optional. (Thanks: `Dick Marinus`_)
 * Fix ipython magic connection (#891). (Thanks: `Irina Truong`_)
 * Fix not enough values to unpack. (Thanks: `Matthieu Guilbert`_)
@@ -837,3 +837,4 @@ Improvements:
 .. _`Rishi Ramraj`: https://github.com/RishiRamraj
 .. _`Matthieu Guilbert`: https://github.com/gma2th
 .. _`Alexandr Korsak`: https://github.com/oivoodoo
+.. _`Saif Hakim`: https://github.com/saifelse
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 29dfa1ba..58986aca 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -354,21 +354,16 @@ class PGExecute(object):
     def _must_raise(self, e):
         """Return true if e is an error that should not be caught in ``run``.
 
-        ``OperationalError``s are raised for errors that are not under the
-        control of the programmer. Usually that means unexpected disconnects,
-        which we shouldn't catch; we handle uncaught errors by prompting the
-        user to reconnect. We *do* want to catch OperationalErrors caused by a
-        lock being unavailable, as reconnecting won't solve that problem.
+        An uncaught error will prompt the user to reconnect; as long as we
+        detect that the connection is stil open, we catch the error, as
+        reconnecting won't solve that problem.
 
         :param e: DatabaseError. An exception raised while executing a query.
 
         :return: Bool. True if ``run`` must raise this exception.
 
         """
-        return (isinstance(e, psycopg2.OperationalError) and
-                (not e.pgcode or
-                 psycopg2.errorcodes.lookup(e.pgcode) not in
-                 ('LOCK_NOT_AVAILABLE', 'CANT_CHANGE_RUNTIME_PARAM')))
+        return self.conn.closed != 0
 
     def execute_normal_sql(self, split_sql):
         """Returns tuple (title, rows, headers, status)"""