- fixed bug where cascade operations incorrectly included deleted collection

items in the cascade [ticket:445]

1 files changed, 1 insertions, 4 deletions

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 42c017bc5..09c90c6ac 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -151,11 +151,8 @@ class PropertyLoader(StrategizedProperty):
         if not type in self.cascade:
             return
         passive = type != 'delete' or self.passive_deletes
-        childlist = sessionlib.attribute_manager.get_history(object, self.key, passive=passive)
-        if childlist is None:
-            return
         mapper = self.mapper.primary_mapper()
-        for c in childlist.added_items() + childlist.deleted_items() + childlist.unchanged_items():
+        for c in sessionlib.attribute_manager.get_as_list(object, self.key, passive=passive):
             if c is not None and c not in recursive and (halt_on is None or not halt_on(c)):
                 if not isinstance(c, self.mapper.class_):
                     raise exceptions.AssertionError("Attribute '%s' on class '%s' doesn't handle objects of type '%s'" % (self.key, str(self.parent.class_), str(c.__class__)))