summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorScott Torborg <storborg@mit.edu>2012-11-10 15:01:30 -0800
committerScott Torborg <storborg@mit.edu>2012-11-10 15:01:30 -0800
commit52e8dcda6d8600f8c6b32fcd0b69920bad43c45b (patch)
treef899184c146e94169d73e6e2534ce98f7441f178 /lib/sqlalchemy
parent607af882c35d0e37dbc2548e8cfb5b9b30df3032 (diff)
downloadsqlalchemy-52e8dcda6d8600f8c6b32fcd0b69920bad43c45b.tar.gz
added test of synchronize_session='fetch' on rows which are not already in the session, and patch to fix failure
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/persistence.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 60eb9b41b..5945addc4 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -986,6 +986,7 @@ class BulkUpdateFetch(BulkFetch, BulkUpdate):
list(primary_key))
for primary_key in self.matched_rows
]
+ if identity_key in session.identity_map
])
attrib = [_attr_as_key(k) for k in self.values]
for state in states: