summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-02-28 21:29:20 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-02-28 21:29:20 +0000
commit5fd371fa9cd8d57aa04d21a704db6fad0a2f2350 (patch)
tree9b128e5a24d64e02d37d1b06f3dff9fa39871d33 /lib/sqlalchemy
parent6ec5b489c60bc474af76220c32ea61939af90daa (diff)
downloadsqlalchemy-5fd371fa9cd8d57aa04d21a704db6fad0a2f2350.tar.gz
some ms/odbc fixes
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py4
-rw-r--r--lib/sqlalchemy/test/requires.py9
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 988088fae..d1ccf44e2 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -803,9 +803,9 @@ class MSExecutionContext(default.DefaultExecutionContext):
if self._select_lastrowid:
if self.dialect.use_scope_identity:
- self.cursor.execute("SELECT scope_identity() AS lastrowid")
+ self.cursor.execute("SELECT scope_identity() AS lastrowid", ())
else:
- self.cursor.execute("SELECT @@identity AS lastrowid")
+ self.cursor.execute("SELECT @@identity AS lastrowid", ())
# fetchall() ensures the cursor is consumed without closing it
row = self.cursor.fetchall()[0]
self._lastrowid = int(row[0])
diff --git a/lib/sqlalchemy/test/requires.py b/lib/sqlalchemy/test/requires.py
index 0bf4689df..6cfab18ce 100644
--- a/lib/sqlalchemy/test/requires.py
+++ b/lib/sqlalchemy/test/requires.py
@@ -66,6 +66,15 @@ def identity(fn):
no_support('sybase', 'not supported by database'),
)
+def independent_cursors(fn):
+ """Target must support simultaneous, independent database cursors on a single connection."""
+
+ return _chain_decorators_on(
+ fn,
+ no_support('mssql+pyodbc', 'no driver support'),
+ no_support('mssql+mxodbc', 'no driver support'),
+ )
+
def independent_connections(fn):
"""Target must support simultaneous, independent database connections."""