diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-09 16:36:58 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-09 16:36:58 -0400 |
| commit | bb791e9e4b5d4e3fe2b9c3baa64185caec6f53d1 (patch) | |
| tree | 2917c6efb588ad19332ac767282af81f0147b0d8 /lib/sqlalchemy/orm/unitofwork.py | |
| parent | 27b0832ea89ce99408d4c02f2269d34cb85233da (diff) | |
| download | sqlalchemy-bb791e9e4b5d4e3fe2b9c3baa64185caec6f53d1.tar.gz | |
removes some unneeded methods, initial DetectKeySwitch not present unnecessarily
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index c93f8af20..537ab74d6 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -224,8 +224,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: @@ -357,18 +357,17 @@ class ProcessAll(PropertyRecMixin, PostSortRec): uow.deps[self.dependency_processor.parent.base_mapper].add(self.dependency_processor) def execute(self, uow): - states = list(self._elements(uow)) + states = self._elements(uow) if self.delete: self.dependency_processor.process_deletes(uow, states) else: self.dependency_processor.process_saves(uow, states) def per_state_flush_actions(self, uow): - # we let the mappers call this, - # so that a ProcessAll which is between two mappers that - # are part of a cycle (but the ProcessAll itself is not - # in the cycle), also becomes a per-state processor, - # and a dependency between the two states as well + # this is handled by SaveUpdateAll and DeleteAll, + # since a ProcessAll should unconditionally be pulled + # into per-state if either the parent/child mappers + # are part of a cycle return iter([]) class SaveUpdateAll(PostSortRec): |