Merge pull request #266 from rygwdn/fix-nullable-foreignkey

Fix related() with nullable foreignkeys on django 1.9.

model_mommy/mommy.py

@@ -371,7 +371,7 @@ def _handle_one_to_many(self, instance, attrs):
         for k, v in attrs.items():
             if django.VERSION >= (1, 9):
                 manager = getattr(instance, k)
-                manager.set(v, bulk=False)
+                manager.set(v, bulk=False, clear=True)
             else:
                 setattr(instance, k, v)
 

test/generic/models.py

@@ -257,6 +257,12 @@ class BaseModelForNext(models.Model):
 class BaseModelForList(models.Model):
     fk = FakeListField()
 
+class Movie(models.Model):
+    title = models.CharField(max_length=30)
+
+class CastMember(models.Model):
+    movie = models.ForeignKey(Movie, related_name='cast_members')
+    person = models.ForeignKey(Person)
 
 if VERSION < (1, 4):
     class DummyIPAddressFieldModel(models.Model):

test/generic/mommy_recipes.py

@@ -75,3 +75,13 @@
 dog_lady = Recipe(Person,
     dog_set = related('dog', other_dog)
 )
+
+nullable_related = Recipe('generic.DummyBlankFieldsModel',
+    dummynullfieldsmodel_set=related(Recipe('generic.DummyNullFieldsModel'))
+)
+
+cast_member = Recipe('generic.CastMember', person=foreign_key(person))
+
+movie_with_cast = Recipe('generic.Movie',
+    cast_members=related(cast_member, cast_member)
+)

test/generic/tests/test_recipes.py

@@ -375,6 +375,14 @@ def test_related_models_recipes(self):
         self.assertEqual(lady.dog_set.all()[0].breed, 'Pug')
         self.assertEqual(lady.dog_set.all()[1].breed, 'Basset')
 
+    def test_nullable_related(self):
+        nullable = mommy.make_recipe('test.generic.nullable_related')
+        self.assertEqual(nullable.dummynullfieldsmodel_set.count(), 1)
+
+    def test_chained_related(self):
+        movie = mommy.make_recipe('test.generic.movie_with_cast')
+        self.assertEqual(movie.cast_members.count(), 2)
+
 
 class M2MFieldTestCase(TestCase):
     def test_create_many_to_many(self):