- mssql: replace "select @@identity" with "select @@scope_identity". Should help...

- mssql: if no db-api module specified, probe in the order [pyodbc, pymssql, adodbapi]

diff --git a/CHANGES b/CHANGES
index 36817c77fbf6d44b98415d11cbc543c29aa2513b..441be8b036586f557f6becb49f77a9e086e2fe22 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -121,6 +121,17 @@
       objects can be associated with a single association collection. 
     - assign_mapper names methods according to their keys (i.e. __name__)
       #551
+- mssql
+    - pyodbc is now the preferred DB-API for MSSQL, and if no module is 
+      specifically requested, will be loaded first on a module probe.
+
+    - The @@SCOPE_IDENTITY is now used instead of @@IDENTITY. This 
+      behavior may be overridden with the engine_connect
+      "use_scope_identity" keyword parameter, which may also be specified 
+      in the dburi.
+
+
+     
 0.3.6
 - sql:
     - bindparam() names are now repeatable!  specify two

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 22fafad814eb271e9c96b7f0db950cf911d78a43..46fe990734eae8189cb3a70032a73a0e9377e155 100644 (file)
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -23,7 +23,7 @@
 * Support for ``SET IDENTITY_INSERT ON`` mode (automagic on / off for 
   ``INSERT`` s)
 
-* Support for auto-fetching of ``@@IDENTITY`` on ``INSERT``
+* Support for auto-fetching of ``@@IDENTITY/@@SCOPE_IDENTITY()`` on ``INSERT``
 
 * ``select.limit`` implemented as ``SELECT TOP n``
 
@@ -256,7 +256,10 @@ class MSSQLExecutionContext(default.DefaultExecutionContext):
                 self.cursor.execute("SET IDENTITY_INSERT %s OFF" % self.compiled.statement.table.name)
                 self.IINSERT = False
             elif self.HASIDENT:
-                self.cursor.execute("SELECT @@IDENTITY AS lastrowid")
+                if self.dialect.use_scope_identity:
+                    self.cursor.execute("SELECT scope_identity() AS lastrowid")
+                else:
+                    self.cursor.execute("SELECT @@identity AS lastrowid")
                 row = self.cursor.fetchone()
                 self._last_inserted_ids = [int(row[0])]
                 # print "LAST ROW ID", self._last_inserted_ids
@@ -264,6 +267,18 @@ class MSSQLExecutionContext(default.DefaultExecutionContext):
         super(MSSQLExecutionContext, self).post_exec()
 
 
+class MSSQLExecutionContext_pyodbc (MSSQLExecutionContext):    
+    def pre_exec(self):
+        """execute "set nocount on" on all connections, as a partial 
+        workaround for multiple result set issues."""
+                
+        if not getattr(self.connection, 'pyodbc_done_nocount', False):
+            self.connection.execute('SET nocount ON')
+            self.connection.pyodbc_done_nocount = True
+            
+        super(MSSQLExecutionContext_pyodbc, self).pre_exec()
+
+
 class MSSQLDialect(ansisql.ANSIDialect):
     colspecs = {
         sqltypes.Unicode : MSNVarchar,
@@ -315,6 +330,7 @@ class MSSQLDialect(ansisql.ANSIDialect):
         super(MSSQLDialect, self).__init__(**params)
         self.auto_identity_insert = auto_identity_insert
         self.text_as_varchar = False
+        self.use_scope_identity = True
         self.set_default_schema_name("dbo")
 
     def dbapi(cls, module_name=None):
@@ -325,24 +341,26 @@ class MSSQLDialect(ansisql.ANSIDialect):
             except KeyError:
                 raise exceptions.InvalidRequestError("Unsupported MSSQL module '%s' requested (must be adodbpi, pymssql or pyodbc)" % module_name)
         else:
-            for dialect_cls in [MSSQLDialect_adodbapi, MSSQLDialect_pymssql, MSSQLDialect_pyodbc]:
+            for dialect_cls in [MSSQLDialect_pyodbc, MSSQLDialect_pymssql, MSSQLDialect_adodbapi]:
                 try:
                     return dialect_cls.import_dbapi()
                 except ImportError, e:
                     pass
             else:
-                raise ImportError('No DBAPI module detected for MSSQL - please install adodbapi, pymssql or pyodbc')
+                raise ImportError('No DBAPI module detected for MSSQL - please install pyodbc, pymssql, or adodbapi')
     dbapi = classmethod(dbapi)
     
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
         opts.update(url.query)
         if opts.has_key('auto_identity_insert'):
-            self.auto_identity_insert = bool(opts.pop('auto_identity_insert'))
+            self.auto_identity_insert = bool(int(opts.pop('auto_identity_insert')))
         if opts.has_key('query_timeout'):
             self.query_timeout = int(opts.pop('query_timeout'))
         if opts.has_key('text_as_varchar'):
-            self.text_as_varchar = bool(opts.pop('text_as_varchar'))
+            self.text_as_varchar = bool(int(opts.pop('text_as_varchar')))
+        if opts.has_key('use_scope_identity'):
+            self.use_scope_identity = bool(int(opts.pop('use_scope_identity')))
         return self.make_connect_string(opts)
 
     def create_execution_context(self, *args, **kwargs):
@@ -641,6 +659,9 @@ class MSSQLDialect_pyodbc(MSSQLDialect):
     def is_disconnect(self, e):
         return isinstance(e, self.dbapi.Error) and '[08S01]' in e.args[1]
 
+    def create_execution_context(self, *args, **kwargs):
+        return MSSQLExecutionContext_pyodbc(self, *args, **kwargs)
+
 
 class MSSQLDialect_adodbapi(MSSQLDialect):
     def import_dbapi(cls):
@@ -811,3 +832,4 @@ class MSSQLIdentifierPreparer(ansisql.ANSIIdentifierPreparer):
 dialect = MSSQLDialect
 
 
+

diff --git a/test/sql/query.py b/test/sql/query.py
index a6b69fb7d6f8f435f6ccba1b18af81c0068ec4d2..eb2012887ad6253fc11e951c52a5adf197124fd2 100644 (file)
--- a/test/sql/query.py
+++ b/test/sql/query.py
@@ -375,6 +375,32 @@ class QueryTest(PersistTest):
             r.close()
         finally:
             shadowed.drop(checkfirst=True)
+    
+    @testbase.supported('mssql')
+    def test_fetchid_trigger(self):
+        meta = BoundMetaData(testbase.db)
+        t1 = Table('t1', meta,
+                Column('id', Integer, Sequence('fred', 100, 1), primary_key=True),
+                Column('descr', String(200)))
+        t2 = Table('t2', meta,
+                Column('id', Integer, Sequence('fred', 200, 1), primary_key=True),
+                Column('descr', String(200)))
+        meta.create_all()
+        con = testbase.db.connect()
+        con.execute("""create trigger paj on t1 for insert as
+            insert into t2 (descr) select descr from inserted""")
+
+        try:
+            tr = con.begin()
+            r = con.execute(t2.insert(), descr='hello')
+            self.assert_(r.last_inserted_ids() == [200])
+            r = con.execute(t1.insert(), descr='hello')
+            self.assert_(r.last_inserted_ids() == [100])
+
+        finally:
+            tr.commit()
+            con.execute("""drop trigger paj""")
+            meta.drop_all()
 
 
 class CompoundTest(PersistTest):