summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-02-16 23:33:20 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-02-16 23:33:20 +0000
commit1f7e0c069c68f60254424081bd184d2955a3b25a (patch)
tree6b1529dbfbaecc2009693e7f46cba35bdcc2e8fa /lib/sqlalchemy/orm/session.py
parentebe7f7b15e03a30ae14263f16fed8a18c35eebd9 (diff)
downloadsqlalchemy-1f7e0c069c68f60254424081bd184d2955a3b25a.tar.gz
- Fixed cascade bug in many-to-one relation() when attribute
was set to None, introduced in r6711 (cascade deleted items into session during add()).
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-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 d5246bee0..c7a5a361b 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1051,7 +1051,7 @@ class Session(object):
def _cascade_save_or_update(self, state):
for state, mapper in _cascade_unknown_state_iterator(
- 'save-update', state, halt_on=lambda c:c in self):
+ 'save-update', state, halt_on=self.__contains__):
self._save_or_update_impl(state)
def delete(self, instance):