diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/dependency.py | 17 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py index 8acf77ad8..e3e2f5d56 100644 --- a/lib/sqlalchemy/orm/dependency.py +++ b/lib/sqlalchemy/orm/dependency.py @@ -26,6 +26,9 @@ class DependencyProcessor(object): self.passive_deletes = prop.passive_deletes self.passive_updates = prop.passive_updates self.enable_typechecks = prop.enable_typechecks + self._passive_delete_flag = self.passive_deletes and \ + attributes.PASSIVE_NO_INITIALIZE or \ + attributes.PASSIVE_OFF self.key = prop.key if not self.prop.synchronize_pairs: raise sa_exc.ArgumentError( @@ -390,7 +393,7 @@ class OneToManyDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: for child in history.deleted: if child is not None and self.hasparent(child) is False: @@ -466,7 +469,7 @@ class OneToManyDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: for child in history.deleted: if child is not None and \ @@ -646,7 +649,7 @@ class ManyToOneDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: if self.cascade.delete_orphan: todelete = history.sum() @@ -669,7 +672,7 @@ class ManyToOneDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: ret = True for child in history.deleted: @@ -697,7 +700,7 @@ class ManyToOneDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: self._post_update(state, uowcommit, history.sum()) @@ -906,7 +909,7 @@ class ManyToManyDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) def presort_saves(self, uowcommit, states): if not self.passive_updates: @@ -954,7 +957,7 @@ class ManyToManyDP(DependencyProcessor): history = uowcommit.get_attribute_history( state, self.key, - passive=self.passive_deletes) + passive=self._passive_delete_flag) if history: for child in history.non_added(): if child is None or \ diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index f1c5fcfc6..07c9c2b6d 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -149,7 +149,7 @@ class UOWTransaction(object): self.states[state] = (isdelete, True) - def get_attribute_history(self, state, key, passive=True): + def get_attribute_history(self, state, key, passive=attributes.PASSIVE_NO_INITIALIZE): """facade to attributes.get_state_history(), including caching of results.""" hashkey = ("history", state, key) |