summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-03-23 19:00:11 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-03-23 19:00:11 -0400
commit35c5fd3fba57a04ebd9083207875692bb92ac6d4 (patch)
treea7a3b968866e8af717ee66894004c4600e5e3dd6 /lib/sqlalchemy/engine
parente69b9542a81a50545e4d4147c2053d126f4fe250 (diff)
downloadsqlalchemy-35c5fd3fba57a04ebd9083207875692bb92ac6d4.tar.gz
Fixed bug whereby a DBAPI that can return "0"
for cursor.lastrowid would not function correctly in conjunction with :attr:`.ResultProxy.inserted_primary_key`.
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/default.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 1db0f2ce4..4c49e58f6 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -679,7 +679,7 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
lastrowid = proc(lastrowid)
self.inserted_primary_key = [
- c is autoinc_col and lastrowid or v
+ lastrowid if c is autoinc_col else v
for c, v in zip(
table.primary_key,
self.inserted_primary_key)