Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField

1 files changed, 17 insertions, 14 deletions

diff --git a/tests/model_meta/models.py b/tests/model_meta/models.py
index 6ce36ed9d6..5189543880 100644
--- a/tests/model_meta/models.py
+++ b/tests/model_meta/models.py
@@ -12,7 +12,7 @@ class Relation(models.Model):
 class AbstractPerson(models.Model):
     # DATA fields
     data_abstract = models.CharField(max_length=10)
-    fk_abstract = models.ForeignKey(Relation, related_name='fk_abstract_rel')
+    fk_abstract = models.ForeignKey(Relation, models.CASCADE, related_name='fk_abstract_rel')
 
     # M2M fields
     m2m_abstract = models.ManyToManyField(Relation, related_name='m2m_abstract_rel')
@@ -22,13 +22,14 @@ class AbstractPerson(models.Model):
     # VIRTUAL fields
     data_not_concrete_abstract = models.ForeignObject(
         Relation,
+        on_delete=models.CASCADE,
         from_fields=['abstract_non_concrete_id'],
         to_fields=['id'],
         related_name='fo_abstract_rel',
     )
 
     # GFK fields
-    content_type_abstract = models.ForeignKey(ContentType, related_name='+')
+    content_type_abstract = models.ForeignKey(ContentType, models.CASCADE, related_name='+')
     object_id_abstract = models.PositiveIntegerField()
     content_object_abstract = GenericForeignKey('content_type_abstract', 'object_id_abstract')
 
@@ -42,7 +43,7 @@ class AbstractPerson(models.Model):
 class BasePerson(AbstractPerson):
     # DATA fields
     data_base = models.CharField(max_length=10)
-    fk_base = models.ForeignKey(Relation, related_name='fk_base_rel')
+    fk_base = models.ForeignKey(Relation, models.CASCADE, related_name='fk_base_rel')
 
     # M2M fields
     m2m_base = models.ManyToManyField(Relation, related_name='m2m_base_rel')
@@ -52,13 +53,14 @@ class BasePerson(AbstractPerson):
     # VIRTUAL fields
     data_not_concrete_base = models.ForeignObject(
         Relation,
+        on_delete=models.CASCADE,
         from_fields=['base_non_concrete_id'],
         to_fields=['id'],
         related_name='fo_base_rel',
     )
 
     # GFK fields
-    content_type_base = models.ForeignKey(ContentType, related_name='+')
+    content_type_base = models.ForeignKey(ContentType, models.CASCADE, related_name='+')
     object_id_base = models.PositiveIntegerField()
     content_object_base = GenericForeignKey('content_type_base', 'object_id_base')
 
@@ -69,7 +71,7 @@ class BasePerson(AbstractPerson):
 class Person(BasePerson):
     # DATA fields
     data_inherited = models.CharField(max_length=10)
-    fk_inherited = models.ForeignKey(Relation, related_name='fk_concrete_rel')
+    fk_inherited = models.ForeignKey(Relation, models.CASCADE, related_name='fk_concrete_rel')
 
     # M2M Fields
     m2m_inherited = models.ManyToManyField(Relation, related_name='m2m_concrete_rel')
@@ -79,13 +81,14 @@ class Person(BasePerson):
     # VIRTUAL fields
     data_not_concrete_inherited = models.ForeignObject(
         Relation,
+        on_delete=models.CASCADE,
         from_fields=['model_non_concrete_id'],
         to_fields=['id'],
         related_name='fo_concrete_rel',
     )
 
     # GFK fields
-    content_type_concrete = models.ForeignKey(ContentType, related_name='+')
+    content_type_concrete = models.ForeignKey(ContentType, models.CASCADE, related_name='+')
     object_id_concrete = models.PositiveIntegerField()
     content_object_concrete = GenericForeignKey('content_type_concrete', 'object_id_concrete')
 
@@ -101,16 +104,16 @@ class ProxyPerson(Person):
 class Relating(models.Model):
 
     # ForeignKey to BasePerson
-    baseperson = models.ForeignKey(BasePerson, related_name='relating_baseperson')
-    baseperson_hidden = models.ForeignKey(BasePerson, related_name='+')
+    baseperson = models.ForeignKey(BasePerson, models.CASCADE, related_name='relating_baseperson')
+    baseperson_hidden = models.ForeignKey(BasePerson, models.CASCADE, related_name='+')
 
     # ForeignKey to Person
-    person = models.ForeignKey(Person, related_name='relating_person')
-    person_hidden = models.ForeignKey(Person, related_name='+')
+    person = models.ForeignKey(Person, models.CASCADE, related_name='relating_person')
+    person_hidden = models.ForeignKey(Person, models.CASCADE, related_name='+')
 
     # ForeignKey to ProxyPerson
-    proxyperson = models.ForeignKey(ProxyPerson, related_name='relating_proxyperson')
-    proxyperson_hidden = models.ForeignKey(ProxyPerson, related_name='+')
+    proxyperson = models.ForeignKey(ProxyPerson, models.CASCADE, related_name='relating_proxyperson')
+    proxyperson_hidden = models.ForeignKey(ProxyPerson, models.CASCADE, related_name='+')
 
     # ManyToManyField to BasePerson
     basepeople = models.ManyToManyField(BasePerson, related_name='relating_basepeople')
@@ -127,11 +130,11 @@ class CommonAncestor(models.Model):
 
 
 class FirstParent(CommonAncestor):
-    first_ancestor = models.OneToOneField(CommonAncestor, primary_key=True, parent_link=True)
+    first_ancestor = models.OneToOneField(CommonAncestor, models.SET_NULL, primary_key=True, parent_link=True)
 
 
 class SecondParent(CommonAncestor):
-    second_ancestor = models.OneToOneField(CommonAncestor, primary_key=True, parent_link=True)
+    second_ancestor = models.OneToOneField(CommonAncestor, models.SET_NULL, primary_key=True, parent_link=True)
 
 
 class Child(FirstParent, SecondParent):