Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #18083 -- Fixed cascade deletion with proxy model of concrete s…

…ubclass. Thanks Simon Charette for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f195f1ed2481d34ff56df36cf46ad7d377f2af93 1 parent 6f7aa51
Carl Meyer carljm authored
7 django/db/models/deletion.py
View
@@ -154,9 +154,10 @@ def collect(self, objs, source=None, nullable=False, collect_related=True,
model = new_objs[0].__class__
- # Recursively collect parent models, but not their related objects.
- # These will be found by meta.get_all_related_objects()
- for parent_model, ptr in model._meta.parents.iteritems():
+ # Recursively collect concrete model's parent models, but not their
+ # related objects. These will be found by meta.get_all_related_objects()
+ concrete_model = model._meta.concrete_model
+ for ptr in concrete_model._meta.parents.itervalues():
if ptr:
parent_objs = [getattr(obj, ptr.name) for obj in new_objs]
self.collect(parent_objs, source=model,
13 tests/modeltests/proxy_model_inheritance/models.py
View
@@ -0,0 +1,13 @@
+
+from django.db import models
+
+
+class ConcreteModel(models.Model):
+ pass
+
+class ConcreteModelSubclass(ConcreteModel):
+ pass
+
+class ConcreteModelSubclassProxy(ConcreteModelSubclass):
+ class Meta:
+ proxy = True
34 tests/modeltests/proxy_model_inheritance/tests.py
View
@@ -1,11 +1,3 @@
-"""
-XX. Proxy model inheritance
-
-Proxy model inheritance across apps can result in syncdb not creating the table
-for the proxied model (as described in #12286). This test creates two dummy
-apps and calls syncdb, then verifies that the table has been created.
-"""
-
from __future__ import absolute_import
import os
@@ -14,12 +6,20 @@
from django.conf import settings
from django.core.management import call_command
from django.db.models.loading import cache, load_app
-from django.test import TransactionTestCase
+from django.test import TestCase, TransactionTestCase
from django.test.utils import override_settings
+from .models import (ConcreteModel, ConcreteModelSubclass,
+ ConcreteModelSubclassProxy)
+
@override_settings(INSTALLED_APPS=('app1', 'app2'))
class ProxyModelInheritanceTests(TransactionTestCase):
+ """
+ Proxy model inheritance across apps can result in syncdb not creating the table
+ for the proxied model (as described in #12286). This test creates two dummy
+ apps and calls syncdb, then verifies that the table has been created.
+ """
def setUp(self):
self.old_sys_path = sys.path[:]
@@ -41,3 +41,19 @@ def test_table_exists(self):
from .app2.models import NiceModel
self.assertEqual(NiceModel.objects.all().count(), 0)
self.assertEqual(ProxyModel.objects.all().count(), 0)
+
+
+class MultiTableInheritanceProxyTest(TestCase):
+
+ def test_model_subclass_proxy(self):
+ """
+ Deleting an instance of a model proxying a multi-table inherited
+ subclass should cascade delete down the whole inheritance chain (see
+ #18083).
+
+ """
+ instance = ConcreteModelSubclassProxy.objects.create()
+ instance.delete()
+ self.assertEqual(0, ConcreteModelSubclassProxy.objects.count())
+ self.assertEqual(0, ConcreteModelSubclass.objects.count())
+ self.assertEqual(0, ConcreteModel.objects.count())
Please sign in to comment.
Something went wrong with that request. Please try again.