diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-15 16:30:41 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-12-15 16:30:41 -0500 |
| commit | 80ae02f7dc3ddc78cbdccd41ddfd3515f980c9ee (patch) | |
| tree | a3f7321d3a63c062d795ca8effc4038ecbe8c8db /lib/sqlalchemy/orm/dependency.py | |
| parent | 1f0e7a6120c3f97d73e6275aa71663ee5709dda5 (diff) | |
| download | sqlalchemy-80ae02f7dc3ddc78cbdccd41ddfd3515f980c9ee.tar.gz | |
- merge rbbd81cb9a341 from 0.6 branch
Diffstat (limited to 'lib/sqlalchemy/orm/dependency.py')
| -rw-r--r-- | lib/sqlalchemy/orm/dependency.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py index 19c78c5c8..ab8045f69 100644 --- a/lib/sqlalchemy/orm/dependency.py +++ b/lib/sqlalchemy/orm/dependency.py @@ -221,6 +221,8 @@ class DependencyProcessor(object): pass def prop_has_changes(self, uowcommit, states, isdelete): + passive = not isdelete or self.passive_deletes + for s in states: # TODO: add a high speed method # to InstanceState which returns: attribute @@ -228,7 +230,7 @@ class DependencyProcessor(object): history = uowcommit.get_attribute_history( s, self.key, - passive=True) + passive=passive) if history and not history.empty(): return True else: |