diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-28 09:39:54 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-09-28 09:39:54 -0400 |
| commit | 6a38697261e271b3600d8f1bbc56f663e5ee9890 (patch) | |
| tree | 763bbb37be51f74bb4d09c2940f54aa30bcbb4d5 /lib | |
| parent | dc4d1ee7bdf8f9670057e916a29f1f5252e77207 (diff) | |
| download | sqlalchemy-6a38697261e271b3600d8f1bbc56f663e5ee9890.tar.gz | |
Add full list of pyodbc error codes for MSSQL
Moved the SQL server error codes out of connnectors/pyodbc.py
and into mssql/pyodbc.py. Added complete list
of odbc-related disconnect codes.
Change-Id: Icd84a920dbfa1f188847f859654ff6f7a48170f1
Fixes: #4095
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/connectors/pyodbc.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/pyodbc.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index b95b2964f..3e1d1a330 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -111,8 +111,6 @@ class PyODBCConnector(Connector): if isinstance(e, self.dbapi.ProgrammingError): return "The cursor's connection has been closed." in str(e) or \ 'Attempt to use a closed connection.' in str(e) - elif isinstance(e, self.dbapi.Error): - return '[08S01]' in str(e) else: return False diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index a667b671e..6fd4fc554 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -275,4 +275,14 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect): version.append(n) return tuple(version) + def is_disconnect(self, e, connection, cursor): + if isinstance(e, self.dbapi.Error): + for code in ( + '08S01', '01002', '08003', '08007', + '08S02', '08001', 'HYT00', 'HY010'): + if code in str(e): + return True + return super(MSDialect_pyodbc, self).is_disconnect( + e, connection, cursor) + dialect = MSDialect_pyodbc |