From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 8 May 2014 15:07:44 +0000 (+0200)
Subject: Another Variant for detecting if a connection is closed
X-Git-Tag: rel_0_9_5~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=939cb91667c451631ad8cdd08585104d7c2093c9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Another Variant for detecting if a connection is closed

If there is a closed attribute on the connection and
it is true, return true. Implements a todo in the code
and helps in one specific disconnect case where it previously
did not match because the error message was "unknown error".
---

diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index 233731b5dc..b79dfdb2a5 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -489,12 +489,16 @@ class PGDialect_psycopg2(PGDialect):
 
     def is_disconnect(self, e, connection, cursor):
         if isinstance(e, self.dbapi.Error):
+            # Is the connection already marked as closed?
+            if getattr(connection, 'closed', False):
+                return True
+
             str_e = str(e).partition("\n")[0]
             for msg in [
                 # these error messages from libpq: interfaces/libpq/fe-misc.c
                 # and interfaces/libpq/fe-secure.c.
                 # TODO: these are sent through gettext in libpq and we can't
-                # check within other locales - consider using connection.closed
+                # check within other locales
                 'terminating connection',
                 'closed the connection',
                 'connection not open',