From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 20 Jan 2006 04:06:51 +0000 (+0000)
Subject: comment out dump, reverse check for self-ref task/delete-matchup
X-Git-Tag: rel_0_1_0~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d4341b8a5e237530c4c916287843456c101624b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

comment out dump, reverse check for self-ref task/delete-matchup
---

diff --git a/lib/sqlalchemy/mapping/objectstore.py b/lib/sqlalchemy/mapping/objectstore.py
index c092cf48f5..d69b82128a 100644
--- a/lib/sqlalchemy/mapping/objectstore.py
+++ b/lib/sqlalchemy/mapping/objectstore.py
@@ -390,7 +390,7 @@ class UOWTransaction(object):
             task.mapper.register_dependencies(self)
 
         head = self._sort_dependencies()
-        print "Task dump:\n" + head.dump()
+        #print "Task dump:\n" + head.dump()
         if head is not None:
             head.execute(self)
             
@@ -622,11 +622,11 @@ class UOWTask(object):
             parenttask = get_task(obj)
             for dep in self.dependencies:
                 (processor, targettask, isdelete) = (dep.processor, dep.targettask, dep.isdeletefrom)
-                if taskelement.isdelete is not dep.isdeletefrom:
-                    continue
-                elif dep.targettask is not self:
+                if dep.targettask is not self:
                     extradep.append(dep)
                     continue
+                elif taskelement.isdelete is not dep.isdeletefrom:
+                    continue
                 #print "GETING LIST OFF PROC", processor.key, "OBJ", repr(obj)
                 childlist = dep.get_object_dependencies(obj, trans, passive = True)
                 if isdelete: