summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-07-22 13:41:47 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-22 13:42:38 -0400
commit63c6aa01040831f2bad52c1f7099a78676ac207a (patch)
treea7e8f6cfb73d3895badfa19ee42da0640e14b328 /lib/sqlalchemy
parent76e127450c4bb7047a9babd5263a80e3c6f4cbf9 (diff)
downloadsqlalchemy-63c6aa01040831f2bad52c1f7099a78676ac207a.tar.gz
- update some SQL server tests, support
- add support for IDENTITY INSERT setting for INSERT with inline VALUES
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index f4264b3d0..d1d4cb9ca 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -769,7 +769,23 @@ class MSExecutionContext(default.DefaultExecutionContext):
if insert_has_sequence:
self._enable_identity_insert = \
- seq_column.key in self.compiled_parameters[0]
+ seq_column.key in self.compiled_parameters[0] or \
+ (
+ self.compiled.statement.parameters and (
+ (
+ self.compiled.statement._has_multi_parameters
+ and
+ seq_column.key in
+ self.compiled.statement.parameters[0]
+ ) or (
+ not
+ self.compiled.statement._has_multi_parameters
+ and
+ seq_column.key in
+ self.compiled.statement.parameters
+ )
+ )
+ )
else:
self._enable_identity_insert = False