- use get_all_pending in per_state_flush_actions(), but we'd like to

streamline get_history() in any case

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index ab8045f69..39ea1db35 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -152,10 +152,8 @@ class DependencyProcessor(object):
             # detect if there's anything changed or loaded
             # by a preprocessor on this state/attribute.  if not,
             # we should be able to skip it entirely.
-            sum_ = uow.get_attribute_history(
-                                            state, 
-                                            self.key, 
-                                            passive=True).sum()
+            sum_ = attributes.get_all_pending(state, state.dict, self.key)
+            
             if not sum_:
                 continue
 
@@ -177,9 +175,10 @@ class DependencyProcessor(object):
                 
             if child_in_cycles:
                 child_actions = []
-                for child_state in sum_:
-                    if child_state is None:
+                for child in sum_:
+                    if child is None:
                         continue
+                    child_state = attributes.instance_state(child)
                     if child_state not in uow.states:
                         child_action = (None, None)
                     else: