diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-12-22 10:36:55 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-12-22 10:36:55 -0500 |
| commit | efbbe88705eb19d68b587aae6dfb60cfe4356edb (patch) | |
| tree | e6467f4cc3121afe91fa1aa81cb02f9a0902a3e0 /lib/sqlalchemy/orm/dynamic.py | |
| parent | 3522785ef493a6cad6403b4c702bbfe2f1b7dc89 (diff) | |
| download | sqlalchemy-efbbe88705eb19d68b587aae6dfb60cfe4356edb.tar.gz | |
- revert the full iteration of the collection for a passive history event; that's
the wrong behavior, and for the original #2637 issue we will have to fix the
association proxy, which is #2642
Diffstat (limited to 'lib/sqlalchemy/orm/dynamic.py')
| -rw-r--r-- | lib/sqlalchemy/orm/dynamic.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py index 28bddd613..c193f0e2a 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -180,7 +180,7 @@ class DynamicAttributeImpl(attributes.AttributeImpl): else: c = CollectionHistory(self, state) - if state.has_identity: + if state.has_identity and (passive & attributes.INIT_OK): return CollectionHistory(self, state, apply_to=c) else: return c @@ -314,10 +314,12 @@ class CollectionHistory(object): self.unchanged_items = util.OrderedIdentitySet(coll) self.added_items = apply_to.added_items self.deleted_items = apply_to.deleted_items + self._reconcile_collection = True else: self.deleted_items = util.OrderedIdentitySet() self.added_items = util.OrderedIdentitySet() self.unchanged_items = util.OrderedIdentitySet() + self._reconcile_collection = False @property def added_plus_unchanged(self): @@ -329,10 +331,14 @@ class CollectionHistory(object): self.unchanged_items).union(self.deleted_items)) def as_history(self): - added = self.added_items.difference(self.unchanged_items) - deleted = self.deleted_items.intersection(self.unchanged_items) - unchanged = self.unchanged_items.difference(deleted) - + if self._reconcile_collection: + added = self.added_items.difference(self.unchanged_items) + deleted = self.deleted_items.intersection(self.unchanged_items) + unchanged = self.unchanged_items.difference(deleted) + else: + added, unchanged, deleted = self.added_items,\ + self.unchanged_items,\ + self.deleted_items return attributes.History( list(added), list(unchanged), |