Ticket #6915: 6915.regressiontest.diff

tests/regressiontests/queries/models.py

@@ -134 +134 @@
     def __unicode__(self):
         return self.data
 
+class Bug6915(models.Model):
+    name = models.CharField(max_length=10)
 
+    deleted = []
+    def delete(self):
+        super(Bug6915, self).delete()
+        self.__class__.deleted.append(self)
+    
+    def __unicode__(self):
+        return u"%s" % self.name
+
 __test__ = {'API_TESTS':"""
 >>> t1 = Tag(name='t1')
 >>> t1.save()
@@ -600 +610 @@
 >>> Author.objects.filter(Q(extra__note=n1)|Q(item__note=n3)).filter(id=a1.id)
 [<Author: a1>]
 
+Bug #6915
+Make shure custom Model.delete() methods are called.
+
+>>> a = Bug6915(name="A")
+>>> a.save()
+>>> Bug6915.objects.all().delete()
+>>> Bug6915.objects.all()
+[]
+>>> Bug6915.deleted
+[<Bug6915: A>]
+>>> a = Bug6915(name="A")
+>>> a.save()
+>>> b = Bug6915(name="B")
+>>> b.save()
+>>> Bug6915.objects.filter(name='B').delete()
+>>> Bug6915.objects.all()
+[<Bug6915: A>]
+>>> Bug6915.deleted
+[<Bug6915: A>, <Bug6915: B>]
+>>> c=Bug6915(name="C")
+>>> c.save()
+>>> Bug6915.objects.order_by('name')[1:].delete()
+>>> Bug6915.deleted
+[<Bug6915: A>, <Bug6915: B>, <Bug6915: C>]
+
 Bug #6981
 >>> Tag.objects.select_related('parent').order_by('name')
 [<Tag: t1>, <Tag: t2>, <Tag: t3>, <Tag: t4>, <Tag: t5>]