From 86a3ad351ec18d9dcd50cac1fc8ada6f904675db Mon Sep 17 00:00:00 2001 From: Stephen Brown Date: Sat, 6 Apr 2019 21:23:52 +0100 Subject: Fixed #30339 -- Made Model.delete(keep_parents=True) preserves nested parent reverse relationships. Thanks Simon Charette for the review. --- tests/delete/models.py | 4 ++++ tests/delete/tests.py | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'tests/delete') diff --git a/tests/delete/models.py b/tests/delete/models.py index d2cce02333..e2ddce0588 100644 --- a/tests/delete/models.py +++ b/tests/delete/models.py @@ -28,6 +28,10 @@ class RChild(R): pass +class RChildChild(RChild): + pass + + class A(models.Model): name = models.CharField(max_length=30) diff --git a/tests/delete/tests.py b/tests/delete/tests.py index fe77d7d4c8..6b1cd3675b 100644 --- a/tests/delete/tests.py +++ b/tests/delete/tests.py @@ -7,8 +7,8 @@ from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature from .models import ( MR, A, Avatar, Base, Child, HiddenUser, HiddenUserProfile, M, M2MFrom, - M2MTo, MRNull, Origin, Parent, R, RChild, Referrer, S, T, User, create_a, - get_default_r, + M2MTo, MRNull, Origin, Parent, R, RChild, RChildChild, Referrer, S, T, + User, create_a, get_default_r, ) @@ -371,6 +371,16 @@ class DeletionTests(TestCase): self.assertTrue(R.objects.filter(id=parent_id).exists()) self.assertTrue(S.objects.filter(pk=parent_referent_id).exists()) + childchild = RChildChild.objects.create() + parent_id = childchild.rchild_ptr.r_ptr_id + child_id = childchild.rchild_ptr_id + parent_referent_id = S.objects.create(r=childchild.rchild_ptr.r_ptr).pk + childchild.delete(keep_parents=True) + self.assertFalse(RChildChild.objects.filter(id=childchild.id).exists()) + self.assertTrue(RChild.objects.filter(id=child_id).exists()) + self.assertTrue(R.objects.filter(id=parent_id).exists()) + self.assertTrue(S.objects.filter(pk=parent_referent_id).exists()) + def test_queryset_delete_returns_num_rows(self): """ QuerySet.delete() should return the number of deleted rows and a -- cgit v1.2.1