diff options
Diffstat (limited to 'lib/sqlalchemy/databases/mssql.py')
| -rw-r--r-- | lib/sqlalchemy/databases/mssql.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 6d2ff66cd..013e78c6a 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -553,6 +553,7 @@ class MSSQLDialect_pymssql(MSSQLDialect): def do_rollback(self, connection): # pymssql throws an error on repeated rollbacks. Ignore it. + # TODO: this is normal behavior for most DBs. are we sure we want to ignore it ? try: connection.rollback() except: @@ -571,6 +572,11 @@ class MSSQLDialect_pymssql(MSSQLDialect): del keys['port'] return [[], keys] + def get_disconnect_checker(self): + def disconnect_checker(e): + return isinstance(e, self.dbapi.DatabaseError) and "Error 10054" in str(e) + return disconnect_checker + ## This code is leftover from the initial implementation, for reference ## def do_begin(self, connection): @@ -630,6 +636,11 @@ class MSSQLDialect_pyodbc(MSSQLDialect): connectors.append ("TrustedConnection=Yes") return [[";".join (connectors)], {}] + def get_disconnect_checker(self): + def disconnect_checker(e): + return isinstance(e, self.dbapi.Error) and '[08S01]' in e.args[1] + return disconnect_checker + class MSSQLDialect_adodbapi(MSSQLDialect): def import_dbapi(cls): @@ -660,6 +671,11 @@ class MSSQLDialect_adodbapi(MSSQLDialect): connectors.append("Integrated Security=SSPI") return [[";".join (connectors)], {}] + def get_disconnect_checker(self): + def disconnect_checker(e): + return isinstance(e, self.dbapi.adodbapi.DatabaseError) and "'connection failure'" in str(e) + return disconnect_checker + dialect_mapping = { 'pymssql': MSSQLDialect_pymssql, 'pyodbc': MSSQLDialect_pyodbc, |