summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-10-03 11:10:42 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-10-03 11:10:42 -0400
commit2dde984e88e1b30144f35e11dc12824bf3e470aa (patch)
tree5eac8289ff87f99292b6b2121cadd65604a72759 /lib/sqlalchemy
parentd778b2d6fb1533091d7e6c0ae5184eef337dbab4 (diff)
downloadsqlalchemy-2dde984e88e1b30144f35e11dc12824bf3e470aa.tar.gz
- add one more #2583 test to cover the "multiple PK switch" use case
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index faa9e5a83..1df9d45ca 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1288,7 +1288,7 @@ class Session(_SessionClassMethods):
# map (see test/orm/test_naturalpks.py ReversePKsTest)
self.identity_map.discard(state)
if state in self.transaction._key_switches:
- orig_key = self.transaction._key_switches[0]
+ orig_key = self.transaction._key_switches[state][0]
else:
orig_key = state.key
self.transaction._key_switches[state] = (orig_key, instance_key)