(no commit message)

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index c41c5edb019a3ddc899d474779c9bb62252726da..787cfd27e610a3731daab91a4bc680f9d126d7f5 100644 (file)
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -811,7 +811,7 @@ class PropertyLoader(MapperProperty):
         elif self.direction == PropertyLoader.LEFT:
             uowcommit.register_dependency(self.parent, self.mapper)
             uowcommit.register_processor(self.parent, False, self, self.parent, False)
-            uowcommit.register_processor(self.mapper, False, self, self.parent, True)
+            uowcommit.register_processor(self.parent, False, self, self.parent, True)
         elif self.direction == PropertyLoader.RIGHT:
             uowcommit.register_dependency(self.mapper, self.parent)
             uowcommit.register_processor(self.mapper, False, self, self.parent, False)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 3e216a768b219582f34c84b1152508be2fce041d..59e639e615d62f1a07ae6edf505c3680f29337ed 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -297,7 +297,7 @@ class UOWTransaction(object):
         try:
             return self.tasks[mapper]
         except KeyError:
-            return self.tasks.setdefault(mapper, UOWTask(mapper))
+            return UOWTask(self, mapper)
             
     def register_dependency(self, mapper, dependency):
         self.dependencies[(mapper, dependency)] = True
@@ -363,7 +363,7 @@ class UOWTransaction(object):
                 return None
             task = bymapper.get(node.item, None)
             if task is None:
-                task = UOWTask(node.item)
+                task = UOWTask(self, node.item)
                 bymapper[node.item] = task
             if node.circular:
                 task.circular = task._sort_circular_dependencies(self)
@@ -394,7 +394,9 @@ class UOWTaskElement(object):
         return "UOWTaskElement/%d: %s/%d %s" % (id(self), self.obj.__class__.__name__, id(self.obj), (self.listonly and 'listonly' or (self.isdelete and 'delete' or 'save')) )
         
 class UOWTask(object):
-    def __init__(self, mapper):
+    def __init__(self, uowtransaction, mapper):
+        uowtransaction.tasks[mapper] = self
+        self.uowtransaction = uowtransaction
         self.mapper = mapper
         self.objects = util.OrderedDict()
         self.dependencies = []
@@ -423,7 +425,7 @@ class UOWTask(object):
             rec.childtask = childtask
         if isdelete:
             rec.isdelete = True
-        
+
     def execute(self, trans):
         """executes this UOWTask.  saves objects to be saved, processes all dependencies
         that have been registered, and deletes objects to be deleted. """
@@ -475,7 +477,7 @@ class UOWTask(object):
             try:
                 return objecttotask[obj]
             except KeyError:
-                t = UOWTask(self.mapper)
+                t = UOWTask(trans, self.mapper)
                 objecttotask[obj] = t
                 return t
 
@@ -489,7 +491,7 @@ class UOWTask(object):
             try:
                 l = dp[(processor, isdelete)]
             except KeyError:
-                l = UOWTask(None)
+                l = UOWTask(trans, None)
                 dp[(processor, isdelete)] = l
             return l
 
@@ -536,7 +538,7 @@ class UOWTask(object):
                 t2 = make_task_tree(n, t)
             return t
             
-        t = UOWTask(self.mapper)
+        t = UOWTask(trans, self.mapper)
         make_task_tree(head, t)
         return t