(no commit message)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index e7d6d7b4d078f311ee8134cd3d1a1960aa1f9d98..14909e23b720206f43bbf398b57957fc00d73d6f 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -191,7 +191,7 @@ class UnitOfWork(object):
         if len(objects):
             for obj in objects:
                 if self.deleted.contains(obj):
-                    commit_context.add_item_to_delete(obj)
+                    commit_context.append_task(obj, isdelete=True)
                 elif self.new.contains(obj) or self.dirty.contains(obj):
                     commit_context.append_task(obj)
         else:
@@ -205,9 +205,11 @@ class UnitOfWork(object):
                     continue
                 commit_context.append_task(obj, listonly = True)
                 for o in item.added_items() + item.deleted_items():
+                    if self.deleted.contains(o):
+                        continue
                     commit_context.append_task(o, listonly = False)
             for obj in self.deleted:
-                commit_context.add_item_to_delete(obj)
+                commit_context.append_task(obj, isdelete=True)
                 
         engines = util.HashSet()
         for mapper in commit_context.mappers:
@@ -255,18 +257,12 @@ class UOWTransaction(object):
         self.deleted_objects = util.HashSet()
         self.deleted_lists = util.HashSet()
 
-    def append_task(self, obj, listonly = False):
+    def append_task(self, obj, isdelete = False, listonly = False):
         mapper = object_mapper(obj)
         self.mappers.append(mapper)
-        task = self.get_task_by_mapper(mapper)
+        task = self.get_task_by_mapper(mapper, isdelete)
         task.append(obj, listonly)
 
-    def add_item_to_delete(self, obj):
-        mapper = object_mapper(obj)
-        self.mappers.append(mapper)
-        task = self.get_task_by_mapper(mapper, True)
-        task.append(obj)
-
     def get_task_by_mapper(self, mapper, isdelete = False):
         try:
             return self.tasks[(mapper, isdelete)]