summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/unitofwork.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-12-17 13:59:24 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-12-17 13:59:24 -0500
commitba964522e15da9062f5ed11e8bf55a0b5fb54693 (patch)
tree47f7b5ea8027bd47f9d57181ae3ff7bf5c6beba4 /lib/sqlalchemy/orm/unitofwork.py
parent0a6f79561517fb5a601ad18831aee70de2d14d00 (diff)
downloadsqlalchemy-ba964522e15da9062f5ed11e8bf55a0b5fb54693.tar.gz
- use get_all_pending in per_state_flush_actions(), but we'd like to
streamline get_history() in any case
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
-rw-r--r--lib/sqlalchemy/orm/unitofwork.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index ab62e5324..1e1eda4a3 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -166,6 +166,8 @@ class UOWTransaction(object):
self.attributes[hashkey] = (history, state_history, passive)
else:
impl = state.manager[key].impl
+ # TODO: store the history as (state, object) tuples
+ # so we don't have to keep converting here
history = impl.get_history(state, state.dict, passive=passive)
if history and impl.uses_objects:
state_history = history.as_state()