Preliminary support for pymssql 1.0.1 [Ticket:1318]

diff --git a/CHANGES b/CHANGES
index 605bd5501440a47c728a0d79890b84d6ffac65dc..9c4ab7d73da15e25c91f602ca0a207023877da70 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -62,6 +62,9 @@ CHANGES
 - postgres
     - Index reflection won't fail when an index with 
       multiple expressions is encountered.
+
+- mssql
+    - Preliminary support for pymssql 1.0.1
     
 0.5.2
 ======

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 90021b1d6548535fa2e2a6c8b29147a61a8b8956..850ac786423681ff77c2c6a08ace727703267107 100644 (file)
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -1270,6 +1270,10 @@ class MSSQLDialect_pymssql(MSSQLDialect):
         # pymmsql doesn't have a Binary method.  we use string
         # TODO: monkeypatching here is less than ideal
         module.Binary = lambda st: str(st)
+        try:
+            module.version_info = tuple(map(int, module.__version__.split('.')))
+        except:
+            module.version_info = (0, 0, 0)
         return module
 
     def __init__(self, **params):
@@ -1291,7 +1295,10 @@ class MSSQLDialect_pymssql(MSSQLDialect):
     def create_connect_args(self, url):
         r = super(MSSQLDialect_pymssql, self).create_connect_args(url)
         if hasattr(self, 'query_timeout'):
-            self.dbapi._mssql.set_query_timeout(self.query_timeout)
+            if self.dbapi.version_info > (0, 8, 0):
+                r[1]['timeout'] = self.query_timeout
+            else:
+                self.dbapi._mssql.set_query_timeout(self.query_timeout) 
         return r
 
     def make_connect_string(self, keys, query):