- Added 'connection shutdown' to the list of exception strings

which indicate a dropped connection.  [ticket:1646]

diff --git a/CHANGES b/CHANGES
index 6d4a2c1d10124b3e89b4e4e4bafdcd748320217f..5907f5dfc7d469b867db998a04d87aa22f212e5a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,9 @@ CHANGES
     passed via query string, so that it is properly interpreted
     by Kinterbasdb. [ticket:1779]
 
+  - Added 'connection shutdown' to the list of exception strings
+    which indicate a dropped connection.  [ticket:1646]
+
 - sqlsoup
   - the SqlSoup constructor accepts a `base` argument which specifies
     the base class to use for mapped classes, the default being

diff --git a/lib/sqlalchemy/dialects/firebird/kinterbasdb.py b/lib/sqlalchemy/dialects/firebird/kinterbasdb.py
index 82d1101a48955d1d7bf22e824c317cf880c4904d..fc7b5720134c61c79e78a32c4316089b15e95562 100644 (file)
--- a/lib/sqlalchemy/dialects/firebird/kinterbasdb.py
+++ b/lib/sqlalchemy/dialects/firebird/kinterbasdb.py
@@ -144,7 +144,8 @@ class FBDialect_kinterbasdb(FBDialect):
             msg = str(e)
             return ('Unable to complete network request to host' in msg or
                     'Invalid connection state' in msg or
-                    'Invalid cursor state' in msg)
+                    'Invalid cursor state' in msg or 
+                    'connection shutdown' in msg)
         else:
             return False