From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 23 Apr 2013 17:07:36 +0000 (-0400)
Subject: - only search in the exception before the first newline, to avoid
X-Git-Tag: rel_0_8_1~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=177ad548c458a9f1b8d43378fa8f16e349f80ac3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- only search in the exception before the first newline, to avoid
false positives for SQL statements containing certain text
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index a3b7ffcb52..2a3d96ae01 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -15,6 +15,7 @@
       the full exception hierarchy.  Specifically the
       "closed the connection unexpectedly" message has now been
       seen in at least three different exception types.
+      Courtesy Eli Collins.
 
     .. change::
       :tags: bug, sql, mysql
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index f5e122a1bf..805fc72aff 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -422,7 +422,7 @@ class PGDialect_psycopg2(PGDialect):
 
     def is_disconnect(self, e, connection, cursor):
         if isinstance(e, self.dbapi.Error):
-            str_e = str(e)
+            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.
@@ -439,7 +439,8 @@ class PGDialect_psycopg2(PGDialect):
                 # be obsolete.   It really says "losed", not "closed".
                 'losed the connection unexpectedly'
             ]:
-                if msg in str_e:
+                idx = str_e.find(msg)
+                if idx >= 0 and '"' not in str_e[:idx]:
                     return True
         return False