Cleanup and optimization 1

Akash-Kumar-Sen · Akash-Kumar-Sen · commit cd9444301eb7 · 2023-05-13T07:13:59.000+05:30
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
@@ -25,7 +25,6 @@ class ON_DELETE_DB_CHOICES(Enum):
     CASCADE_DB = "CASCADE"
     RESTRICT_DB = "RESTRICT"
     SET_NULL_DB = "SET NULL"
-    SET_DEFAULT_DB = "SET DEFAULT"
 
 
 def CASCADE(collector, field, sub_objs, using):
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
@@ -1049,8 +1049,10 @@ def _check_on_delete(self):
             return [
                 checks.Error(
                     "Field specifies unsupported on_delete=DB_CASCADE, on "
-                    "inherited model",
-                    hint="Set a default value, or change the on_delete rule.",
+                    "inherited model as it already contains a parent_ptr "
+                    "with in-python cascading options, both cannot be used "
+                    "together",
+                    hint="Change the on_delete rule to other options",
                     obj=self,
                     id="fields.E325",
                 )
diff --git a/tests/db_cascade/models.py b/tests/db_cascade/models.py
@@ -29,15 +29,6 @@ class Baz(models.Model):
     )
 
 
-# class Fiz(models.Model):
-#     """Third level foreignkey child for Foo
-#     Implemented using in python cascading"""
-#     baz = models.ForeignKey(
-#         Baz,
-#         on_delete=models.CASCADE
-#     )
-
-
 class RestrictBar(models.Model):
     """First level child of foo with cascading set to restrict"""
 
diff --git a/tests/db_cascade_checks/tests.py b/tests/db_cascade_checks/tests.py
@@ -115,8 +115,10 @@ class MultipleInheritedBar(Foo, Bar):
             [
                 Error(
                     "Field specifies unsupported on_delete=DB_CASCADE, on "
-                    "inherited model",
-                    hint="Set a default value, or change the on_delete rule.",
+                    "inherited model as it already contains a parent_ptr "
+                    "with in-python cascading options, both cannot be used "
+                    "together",
+                    hint="Change the on_delete rule to other options",
                     obj=field,
                     id="fields.E325",
                 )
@@ -129,8 +131,10 @@ class MultipleInheritedBar(Foo, Bar):
             [
                 Error(
                     "Field specifies unsupported on_delete=DB_CASCADE, on "
-                    "inherited model",
-                    hint="Set a default value, or change the on_delete rule.",
+                    "inherited model as it already contains a parent_ptr "
+                    "with in-python cascading options, both cannot be used "
+                    "together",
+                    hint="Change the on_delete rule to other options",
                     obj=multiple_inheritence_field,
                     id="fields.E325",
                 )
