diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-26 16:55:11 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-26 16:55:11 -0400 |
| commit | 4c87fb761379348475bcea09a1293eb1dddc6544 (patch) | |
| tree | f9bf94131e3190ffa9af58ecfe6a22dc780fe89a /lib/sqlalchemy | |
| parent | 9f45612c63a723fb94be8ce3489973c1235a62d6 (diff) | |
| download | sqlalchemy-4c87fb761379348475bcea09a1293eb1dddc6544.tar.gz | |
- Fixed regression introduced in 0.6.0 involving improper
history accounting on mutable attributes. Essentially
reversing r6b2b4fcd4799 and getting it covered.
[ticket:1782]
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 5ac8ef9ee..4390538a0 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -500,8 +500,7 @@ class MutableScalarAttributeImpl(ScalarAttributeImpl): self, state, v) def check_mutable_modified(self, state, dict_): - v = dict_.get(self.key, NO_VALUE) - a, u, d = History.from_attribute(self, state, v) + a, u, d = self.get_history(state, dict_) return bool(a or d) def get(self, state, dict_, passive=PASSIVE_OFF): |
