- Fixed bug which prevented "mutable primary key" dependency

logic from functioning properly on a one-to-one
relation().  [ticket:1406]
- moved MySQL to use innodb for naturalpks tests

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index c4ba7852f..a80727b7f 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -261,7 +261,8 @@ class OneToManyDP(DependencyProcessor):
                     if not history:
                         history = uowcommit.get_attribute_history(state, self.key, passive=False)
                     for child in history.unchanged:
-                        uowcommit.register_object(child)
+                        if child is not None:
+                            uowcommit.register_object(child)
 
     def _synchronize(self, state, child, associationrow, clearkeys, uowcommit):
         source = state