diff options
| author | John Anderson <sontek@gmail.com> | 2013-03-18 15:04:30 -0700 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2013-03-18 15:04:30 -0700 |
| commit | eefa4b68f5dce3770d9b95455e9f14439f6bbd72 (patch) | |
| tree | 0d2a82995b76df70eed537c78b7bb18d6dba2f48 | |
| parent | cb43db6bd1354191732bf503fac84cf3c261bcb5 (diff) | |
| download | sqlalchemy-eefa4b68f5dce3770d9b95455e9f14439f6bbd72.tar.gz | |
cleaned up errors, only check for connection timeout for now
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/pymssql.py | 5 | ||||
| -rw-r--r-- | test/dialect/test_mssql.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py index 0754f7f76..08e8fca6a 100644 --- a/lib/sqlalchemy/dialects/mssql/pymssql.py +++ b/lib/sqlalchemy/dialects/mssql/pymssql.py @@ -85,9 +85,8 @@ class MSDialect_pymssql(MSDialect): def is_disconnect(self, e, connection, cursor): for msg in ( - "Error 20003", # Connection Timeout - "Error 20004", # Read from SQL server failed - "Error 20006", # Write to SQL Server failed + "Adaptive Server connection timed out", + "message 20003", # connection timeout "Error 10054", "Not connected to any MS SQL server", "Connection is closed" diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py index b38d76372..bddc88777 100644 --- a/test/dialect/test_mssql.py +++ b/test/dialect/test_mssql.py @@ -1323,8 +1323,8 @@ class ParseConnectTest(fixtures.TestBase, AssertsCompiledSQL): def test_pymssql_disconnect(self): dialect = pymssql.dialect() - for error in ['20003', '20003', '20006']: - eq_(dialect.is_disconnect('Error %s' % error, None, None), True) + for error in ['Adaptive Server connection timed out', 'message 20003']: + eq_(dialect.is_disconnect(error, None, None), True) @testing.only_on(['mssql+pyodbc', 'mssql+pymssql'], "FreeTDS specific test") def test_bad_freetds_warning(self): |