more fix to one-to-one: 'unchanged_items' can be [None] also with one to one so check...

during delete

diff --git a/lib/sqlalchemy/mapping/properties.py b/lib/sqlalchemy/mapping/properties.py
index d03069f1ec42069a3caba0a5d38380d9f67ff2bd..c8f56746da28169b23122bc7cd7a6872e85c1e99 100644 (file)
--- a/lib/sqlalchemy/mapping/properties.py
+++ b/lib/sqlalchemy/mapping/properties.py
@@ -455,8 +455,9 @@ class PropertyLoader(MapperProperty):
             for obj in deplist:
                 childlist = getlist(obj, False)
                 for child in childlist.deleted_items() + childlist.unchanged_items():
-                    self._synchronize(obj, child, None, True)
-                    uowcommit.register_object(child, postupdate=self.post_update)
+                    if child is not None:
+                        self._synchronize(obj, child, None, True)
+                        uowcommit.register_object(child, postupdate=self.post_update)
         elif self.association is not None:
             # manage association objects.
             for obj in deplist:

diff --git a/test/onetoone.py b/test/onetoone.py
index 77c38ff2a5584be5eddf02c6eed4c7c71f242575..9ff330c92638d864baf4f4689838ae9bb72af81e 100644 (file)
--- a/test/onetoone.py
+++ b/test/onetoone.py
@@ -79,5 +79,8 @@ class O2OTest(testbase.AssertMixin):
         self.assert_(p.jack is None)
         objectstore.commit() 
 
+       j.delete()
+       objectstore.commit()
+
 if __name__ == "__main__":    
     testbase.main()