summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/unitofwork.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-12-17 14:19:22 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-12-17 14:19:22 -0500
commit2e7a54d6fbfe9260887a0eb848e296e3b5e59c47 (patch)
tree66b121a8a3a984e676acf47997ac119878d7ccd1 /lib/sqlalchemy/orm/unitofwork.py
parentb5f3648188ee46e7c0353d3123f8ed6d55f31b56 (diff)
parentba964522e15da9062f5ed11e8bf55a0b5fb54693 (diff)
downloadsqlalchemy-2e7a54d6fbfe9260887a0eb848e296e3b5e59c47.tar.gz
merge tip
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()