[tests] Django 2.0 compatibility: on_delete on ForeignKeys

Author: paulocheque

django_dynamic_fixture/models_test.py

@@ -43,7 +43,7 @@ class Meta:
 class ModelWithBooleans(models.Model):
     # https://docs.djangoproject.com/en/1.6/ref/models/fields/#booleanfield
     # Django 1.6 changed the default value of BooleanField from False to None
-    boolean = models.BooleanField()
+    boolean = models.BooleanField(default=False)
     nullboolean = models.NullBooleanField()
 
     class Meta:
@@ -99,7 +99,7 @@ class ModelWithDefaultValues(models.Model):
     string_with_choices = models.CharField(max_length=5, null=True, choices=(('a', 'A'), ('b', 'B')))
     string_with_choices_and_default = models.CharField(max_length=5, null=True, default='b', choices=(('a', 'A'), ('b', 'B')))
     string_with_optgroup_choices = models.CharField(max_length=5, null=True, choices=(('group1', (('a', 'A'), ('b', 'B'))), ('group2', (('c', 'C'), ('d', 'D')))))
-    foreign_key_with_default = models.ForeignKey(EmptyModel, null=True, default=None)
+    foreign_key_with_default = models.ForeignKey(EmptyModel, null=True, default=None, on_delete=None)
 
     class Meta:
         verbose_name = 'Default values'
@@ -128,16 +128,16 @@ class ModelForIgnoreList(models.Model):
     required_with_default = models.IntegerField(null=False, default=1)
     not_required = models.IntegerField(null=True)
     not_required_with_default = models.IntegerField(null=True, default=1)
-    self_reference = models.ForeignKey('ModelForIgnoreList', null=True)
-    different_reference = models.ForeignKey(ModelForIgnoreList2, null=True)
+    self_reference = models.ForeignKey('ModelForIgnoreList', null=True, on_delete=None)
+    different_reference = models.ForeignKey(ModelForIgnoreList2, null=True, on_delete=None)
 
     class Meta:
         verbose_name = 'Ignore list'
         app_label = 'django_dynamic_fixture'
 
 
 class ModelRelated(models.Model):
-    selfforeignkey = models.ForeignKey('self', null=True)
+    selfforeignkey = models.ForeignKey('self', null=True, on_delete=None)
     integer = models.IntegerField(null=True)
     integer_b = models.IntegerField(null=True)
 
@@ -147,8 +147,8 @@ class Meta:
 
 
 class ModelRelatedThrough(models.Model):
-    related = models.ForeignKey('ModelRelated')
-    relationship = models.ForeignKey('ModelWithRelationships')
+    related = models.ForeignKey('ModelRelated', on_delete=None)
+    relationship = models.ForeignKey('ModelWithRelationships', on_delete=None)
 
     class Meta:
         app_label = 'django_dynamic_fixture'
@@ -167,14 +167,14 @@ def default_fk_id():
 
 class ModelWithRelationships(models.Model):
     # relationship
-    selfforeignkey = models.ForeignKey('self', null=True)
-    foreignkey = models.ForeignKey('ModelRelated', related_name='fk', null=True)
-    onetoone = models.OneToOneField('ModelRelated', related_name='o2o', null=True)
+    selfforeignkey = models.ForeignKey('self', null=True, on_delete=None)
+    foreignkey = models.ForeignKey('ModelRelated', related_name='fk', null=True, on_delete=None)
+    onetoone = models.OneToOneField('ModelRelated', related_name='o2o', null=True, on_delete=None)
     manytomany = models.ManyToManyField('ModelRelated', related_name='m2m')
     manytomany_through = models.ManyToManyField('ModelRelated', related_name='m2m_through', through=ModelRelatedThrough)
 
-    foreignkey_with_default = models.ForeignKey('ModelRelated', related_name='fk2', null=True, default=default_fk_value)
-    foreignkey_with_id_default = models.ForeignKey('ModelRelated', related_name='fk3', null=True, default=default_fk_id)
+    foreignkey_with_default = models.ForeignKey('ModelRelated', related_name='fk2', null=True, default=default_fk_value, on_delete=None)
+    foreignkey_with_id_default = models.ForeignKey('ModelRelated', related_name='fk3', null=True, default=default_fk_id, on_delete=None)
 
     integer = models.IntegerField(null=True)
     integer_b = models.IntegerField(null=True)
@@ -187,15 +187,15 @@ class Meta:
 
 
 class ModelWithCyclicDependency(models.Model):
-    d = models.ForeignKey('ModelWithCyclicDependency2', null=True)
+    d = models.ForeignKey('ModelWithCyclicDependency2', null=True, on_delete=None)
 
     class Meta:
         verbose_name = 'Cyclic dependency'
         app_label = 'django_dynamic_fixture'
 
 
 class ModelWithCyclicDependency2(models.Model):
-    c = models.ForeignKey(ModelWithCyclicDependency, null=True)
+    c = models.ForeignKey(ModelWithCyclicDependency, null=True, on_delete=None)
 
     class Meta:
         verbose_name = 'Cyclic dependency 2'
@@ -223,15 +223,15 @@ class Meta:
 
 
 class ModelChildWithCustomParentLink(ModelParent):
-    my_custom_ref = models.OneToOneField(ModelParent, parent_link=True, related_name='my_custom_ref_x')
+    my_custom_ref = models.OneToOneField(ModelParent, parent_link=True, related_name='my_custom_ref_x', on_delete=None)
 
     class Meta:
         verbose_name = 'Custom child'
         app_label = 'django_dynamic_fixture'
 
 
 class ModelWithRefToParent(models.Model):
-    parent = models.ForeignKey(ModelParent)
+    parent = models.ForeignKey(ModelParent, on_delete=None)
 
     class Meta:
         verbose_name = 'Child with parent'
@@ -320,7 +320,7 @@ class ModelForCopy(models.Model):
     int_b = models.IntegerField(null=None)
     int_c = models.IntegerField()
     int_d = models.IntegerField()
-    e = models.ForeignKey(ModelForCopy2)
+    e = models.ForeignKey(ModelForCopy2, on_delete=None)
 
     class Meta:
         verbose_name = 'Copy'
@@ -339,8 +339,8 @@ class Meta:
 class ModelForLibrary(models.Model):
     integer = models.IntegerField(null=True)
     integer_unique = models.IntegerField(null=True, unique=True)
-    selfforeignkey = models.ForeignKey('self', null=True)
-    foreignkey = models.ForeignKey('ModelForLibrary2', related_name='fk', null=True)
+    selfforeignkey = models.ForeignKey('self', null=True, on_delete=None)
+    foreignkey = models.ForeignKey('ModelForLibrary2', related_name='fk', null=True, on_delete=None)
 
     class Meta:
         verbose_name = 'Library'

django_dynamic_fixture/tests/test_django_helper.py

@@ -105,7 +105,7 @@ class Meta:
     def test_model_has_the_field(self):
         class ModelWithWithoutFields_test_model_has_the_field(models.Model):
             integer = models.IntegerField()
-            selfforeignkey = models.ForeignKey('self', null=True)
+            selfforeignkey = models.ForeignKey('self', null=True, on_delete=None)
             manytomany = models.ManyToManyField('self', related_name='m2m')
         self.assertEquals(True, model_has_the_field(ModelWithWithoutFields_test_model_has_the_field, 'integer'))
         self.assertEquals(True, model_has_the_field(ModelWithWithoutFields_test_model_has_the_field, 'selfforeignkey'))
@@ -123,16 +123,16 @@ class Model4GetUniqueFieldName_test_get_unique_field_name(models.Model):
     def test_get_related_model(self):
         class ModelRelated_test_get_related_model(models.Model): pass
         class Model4GetRelatedModel_test_get_related_model(models.Model):
-            fk = models.ForeignKey(ModelRelated_test_get_related_model)
+            fk = models.ForeignKey(ModelRelated_test_get_related_model, on_delete=None)
         self.assertEquals(ModelRelated_test_get_related_model,
                           get_related_model(get_field_by_name_or_raise(Model4GetRelatedModel_test_get_related_model, 'fk')))
 
     def test_field_is_a_parent_link(self):
         class ModelParent_test_get_related_model(models.Model): pass
         class Model4FieldIsParentLink_test_get_related_model(ModelParent):
-            o2o_with_parent_link = models.OneToOneField(ModelParent_test_get_related_model, parent_link=True, related_name='my_custom_ref_x')
+            o2o_with_parent_link = models.OneToOneField(ModelParent_test_get_related_model, parent_link=True, related_name='my_custom_ref_x', on_delete=None)
         class Model4FieldIsParentLink2(ModelParent):
-            o2o_without_parent_link = models.OneToOneField(ModelParent_test_get_related_model, parent_link=False, related_name='my_custom_ref_y')
+            o2o_without_parent_link = models.OneToOneField(ModelParent_test_get_related_model, parent_link=False, related_name='my_custom_ref_y', on_delete=None)
         # FIXME
         #self.assertEquals(True, field_is_a_parent_link(get_field_by_name_or_raise(Model4FieldIsParentLink, 'o2o_with_parent_link')))
         self.assertEquals(False, field_is_a_parent_link(get_field_by_name_or_raise(Model4FieldIsParentLink2, 'o2o_without_parent_link')))
@@ -166,8 +166,8 @@ class ModelForKeyField_test_is_key_field(models.Model):
 
     def test_is_relationship_field(self):
         class ModelForRelationshipField_test_is_relationship_field(models.Model):
-            fk = models.ForeignKey('self')
-            one2one = models.OneToOneField('self')
+            fk = models.ForeignKey('self', on_delete=None)
+            one2one = models.OneToOneField('self', on_delete=None)
         self.assertEquals(True, is_relationship_field(get_field_by_name_or_raise(ModelForRelationshipField_test_is_relationship_field, 'fk')))
         self.assertEquals(True, is_relationship_field(get_field_by_name_or_raise(ModelForRelationshipField_test_is_relationship_field, 'one2one')))
         self.assertEquals(False, is_relationship_field(get_field_by_name_or_raise(ModelForRelationshipField_test_is_relationship_field, 'id')))