diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-09 18:04:18 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-09 18:04:18 -0400 |
commit | a91ea946c7ebd81243dd1413de9195ee2e385a30 (patch) | |
tree | f4420f7176549772030b71a3b18b1f697c986c99 /lib/sqlalchemy/orm/unitofwork.py | |
parent | d81944ec9ea202a27ef9430d0c56d8773a9b1ecf (diff) | |
download | sqlalchemy-a91ea946c7ebd81243dd1413de9195ee2e385a30.tar.gz |
fix bug + add coverage to ensure unneeded SaveUpdateAll/DeleteAll plus extra
work doesn't occur during per-state usage
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
-rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index 163adff14..1c1b93c47 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -80,8 +80,9 @@ class UOWTransaction(object): self.attributes = {} # dictionary of mappers to sets of - # DependencyProcessors which have that mapper - # as a parent. + # DependencyProcessors, which are also + # set to be part of the sorted flush actions, + # which have that mapper as a parent. self.deps = util.defaultdict(set) # dictionary of mappers to sets of InstanceState @@ -151,7 +152,6 @@ class UOWTransaction(object): def register_preprocessor(self, processor, fromparent): self.presort_actions.add(Preprocess(processor, fromparent)) - self.deps[processor.parent.base_mapper].add(processor) def register_object(self, state, isdelete=False, listonly=False): if not self.session._contains_state(state): @@ -248,8 +248,8 @@ class UOWTransaction(object): #sort = topological.sort(self.dependencies, postsort_actions) #print "--------------" #print self.dependencies - #print postsort_actions - #print "COUNT OF POSTSORT ACTIONS", len(postsort_actions) + print postsort_actions + print "COUNT OF POSTSORT ACTIONS", len(postsort_actions) # execute if self.cycles: @@ -360,6 +360,7 @@ class ProcessAll(IterateMappersMixin, PostSortRec): self.dependency_processor = dependency_processor self.delete = delete self.fromparent = fromparent + uow.deps[dependency_processor.parent.base_mapper].add(dependency_processor) def execute(self, uow): states = self._elements(uow) |