From: John Anderson <sontek@gmail.com>
Date: Mon, 18 Mar 2013 22:04:30 +0000 (-0700)
Subject: cleaned up errors, only check for connection timeout for now
X-Git-Tag: rel_0_8_1~26^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eefa4b68f5dce3770d9b95455e9f14439f6bbd72;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cleaned up errors, only check for connection timeout for now
---

diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py
index 0754f7f764..08e8fca6a2 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 b38d763723..bddc887779 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):