merge [3215] into trunk

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 9e00f2caa9e444b93cc9d3a8b65abcf619af2d8e..5faaf31bf3edffbfda8fae396d28a8ca151c5c68 100644 (file)
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -709,6 +709,15 @@ class MSSQLDialect_pymssql(MSSQLDialect):
 
 class MSSQLDialect_pyodbc(MSSQLDialect):
     
+    def __init__(self, **params):
+        super(MSSQLDialect_pyodbc, self).__init__(**params)
+        # whether use_scope_identity will work depends on the version of pyodbc
+        try:
+            import pyodbc
+            self.use_scope_identity = hasattr(pyodbc.Cursor, 'nextset')
+        except:
+            pass
+        
     def import_dbapi(cls):
         import pyodbc as module
         return module