Changeset 8128

Timestamp:

07/27/08 20:32:46 (5 months ago)

Author:

mtredinnick

Message:

Fixed #7853 -- Fixed another case of deleting inherited models with foreign key
references. Thanks to Russell for the test case that demonstrated the problem.

Files:

• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_inheritance_regress/models.py (modified) (2 diffs)

django/trunk/django/db/models/query.py

@@ -836 +836 @@
-
-        update_query = sql.UpdateQuery(cls, connection)
- in cls._meta.fields
+, model in cls._meta.get_fields_with_model()
-            if (field.rel and field.null and field.rel.to in seen_objs and
-                    filter(lambda f: f.column == field.column,
-                    field.rel.to._meta.fields)):
-
+
+
+
+
+
-
-    # Now delete the actual data.

django/trunk/tests/regressiontests/model_inheritance_regress/models.py

@@ -53 +53 @@
-    name = models.CharField(max_length=10)
-
+class SelfRefParent(models.Model):
+    parent_data = models.IntegerField()
+    self_data = models.ForeignKey('self', null=True)
-
+class SelfRefChild(SelfRefParent):
+    child_data = models.IntegerField()
-
-__test__ = {'API_TESTS':"""
@@ -183 +188 @@
-[]
-
+# Regression test for #7853
+# If the parent class has a self-referential link, make sure that any updates
+# to that link via the child update the right table.
+
+>>> obj = SelfRefChild.objects.create(child_data=37, parent_data=42)
+>>> obj.delete()
+
-"""}