summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/attributes.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-03-14 16:56:05 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-03-14 16:56:05 +0000
commitbbf9f191ec10067d282df63f4c684af2c00d8110 (patch)
tree5bb2f359712a420690613d867f8a0ae2daa70bda /lib/sqlalchemy/attributes.py
parentfc43d50cec01cf3adf7a37b799f470f9445f3313 (diff)
downloadsqlalchemy-bbf9f191ec10067d282df63f4c684af2c00d8110.tar.gz
fixed attributes bug where if an object is committed, its lazy-loaded list got
blown away if it hadnt been loaded
Diffstat (limited to 'lib/sqlalchemy/attributes.py')
-rw-r--r--lib/sqlalchemy/attributes.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/attributes.py b/lib/sqlalchemy/attributes.py
index a41cdac9d..b03ead1c2 100644
--- a/lib/sqlalchemy/attributes.py
+++ b/lib/sqlalchemy/attributes.py
@@ -214,7 +214,7 @@ class CallableProp(object):
value = None
p = self.manager.create_list(self.obj, self.key, value, readonly=self.live, **self.kwargs)
- if not self.live:
+ if not self.live and not passive:
# set the new history list as the new attribute, discards ourself
self.manager.attribute_history(self.obj)[self.key] = p
self.manager = None