Changeset 8100

Timestamp:

07/26/08 23:18:52 (4 months ago)

Author:

mtredinnick

Message:

Fixed #7778 -- Fixed a tricky case of foreign key clearing with inherited
models. Patch from James Murty.

Files:

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

django/trunk/AUTHORS

@@ -281 +281 @@
-    mrmachine <real.human@mrmachine.net>
-    Robin Munn <http://www.geekforgod.com/>
+    James Murty
-    msundstr
-    Robert Myers <myer0052@gmail.com>

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

@@ -837 +837 @@
-        update_query = sql.UpdateQuery(cls, connection)
-        for field in cls._meta.fields:
-
+
+
+
-                update_query.clear_related(field, pk_list)
-

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

@@ -190 +190 @@
-class Related(models.Model):
-    custom = models.ForeignKey(CustomPk)
+
+# An inter-related setup with a model subclass that has a nullable
+# path to another model, and a return path from that model.
+
+class Celebrity(models.Model):
+    name = models.CharField("Name", max_length=20)
+    greatest_fan = models.ForeignKey("Fan", null=True, unique=True)
+
+class TvChef(Celebrity):
+    pass
+
+class Fan(models.Model):
+    fan_of = models.ForeignKey(Celebrity)
-
-
@@ -837 +850 @@
-3
-
+Bug #7778 - Model subclasses could not be deleted if a nullable foreign key
+relates to a model that relates back.
+
+>>> num_celebs = Celebrity.objects.count()
+>>> tvc = TvChef.objects.create(name="Huey")
+>>> Celebrity.objects.count() == num_celebs + 1
+True
+>>> f1 = Fan.objects.create(fan_of=tvc)
+>>> f2 = Fan.objects.create(fan_of=tvc)
+>>> tvc.delete()
+
+# The parent object should have been deleted as well.
+>>> Celebrity.objects.count() == num_celebs
+True
+
-"""}
-