(no commit message)

diff --git a/examples/adjacencytree/basic_tree.py b/examples/adjacencytree/basic_tree.py
index e77ab4f05c6d0518c62b64350590669d94526fd3..3fcf5e8fe09e102f98bf9e526643f6a0ca73b8c5 100644 (file)
--- a/examples/adjacencytree/basic_tree.py
+++ b/examples/adjacencytree/basic_tree.py
@@ -101,8 +101,6 @@ print "Committing:"
 print "----------------------------"
 objectstore.commit()
 
-#sys.exit()
-
 print "\n\n\n----------------------------"
 print "Tree After Save:"
 print "----------------------------"

diff --git a/examples/adjacencytree/byroot_tree.py b/examples/adjacencytree/byroot_tree.py
index 2b16b4a71a09dc1723ca73a15edc257e08374d52..4d767af59db93dc688a9f93221141a2955606c02 100644 (file)
--- a/examples/adjacencytree/byroot_tree.py
+++ b/examples/adjacencytree/byroot_tree.py
@@ -160,8 +160,6 @@ print "Committing:"
 print "----------------------------"
 objectstore.commit()
 
-#sys.exit()
-
 print "\n\n\n----------------------------"
 print "Tree After Save:"
 print "----------------------------"

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index 366e86b6d324f0f72496fc85bd4843d055e03637..cb5ba8b62b621270883f376a5d60ccdbccf85f1f 100644 (file)
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -818,7 +818,6 @@ class PropertyLoader(MapperProperty):
         if self.direction == PropertyLoader.CENTER:
             secondary_delete = []
             secondary_insert = []
-            associationrow = {}
             if delete:
                 for obj in deplist:
                     childlist = getlist(obj, False)
@@ -831,12 +830,10 @@ class PropertyLoader(MapperProperty):
                 for obj in deplist:
                     childlist = getlist(obj)
                     if childlist is None: continue
-                    clearkeys = False
                     for child in childlist.added_items():
                         associationrow = {}
                         self._synchronize(obj, child, associationrow, False)
                         secondary_insert.append(associationrow)
-                    clearkeys = True
                     for child in childlist.deleted_items():
                         associationrow = {}
                         self._synchronize(obj, child, associationrow, True)
@@ -897,17 +894,18 @@ class PropertyLoader(MapperProperty):
             dest = associationrow
 
         for rule in self.syncrules:
+            localsource = source
             (smapper, scol, dmapper, dcol) = rule
-            if source is None:
+            if localsource is None:
                 if dmapper == PropertyLoader.LEFT:
-                    source = obj
+                    localsource = obj
                 elif dmapper == PropertyLoader.RIGHT:
-                    source = child
+                    localsource = child
 
             if clearkeys:
                 value = None
             else:
-                value = smapper._getattrbycolumn(source, scol)
+                value = smapper._getattrbycolumn(localsource, scol)
 
             if dest is associationrow:
                 associationrow[dcol.key] = value