From 9218fcf2477cd6a2a611e2f967bb3b4a99833660 Mon Sep 17 00:00:00 2001 From: Lele Gaifax Date: Tue, 29 Dec 2009 11:05:55 +0000 Subject: [PATCH] Recognize more Firebird disconnection cases, fixing #1646 on 0.5.x --- lib/sqlalchemy/databases/firebird.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py index 9a742cae09..d61e8092bb 100644 --- a/lib/sqlalchemy/databases/firebird.py +++ b/lib/sqlalchemy/databases/firebird.py @@ -394,11 +394,10 @@ class FBDialect(default.DefaultDialect): return False def is_disconnect(self, e): - if isinstance(e, self.dbapi.OperationalError): - return 'Unable to complete network request to host' in str(e) - elif isinstance(e, self.dbapi.ProgrammingError): + if isinstance(e, (self.dbapi.OperationalError, self.dbapi.ProgrammingError)): msg = str(e) - return ('Invalid connection state' in msg or + return ('Unable to complete network request to host' in msg or + 'Invalid connection state' in msg or 'Invalid cursor state' in msg) else: return False -- 2.47.3