Ticket #6915: 6915.naive.r7787.diff

django/db/models/query.py

@@ -351 +351 @@
         """
         Deletes the records in the current QuerySet.
         """
-        assert self.query.can_filter(), \
-                "Cannot use 'limit' or 'offset' with delete."
 
         del_query = self._clone()
 
         # Disable non-supported fields.
         del_query.query.select_related = False
         del_query.query.clear_ordering()
+        
+        # Delete objects individually if self is sliced or self.model has a custom delete() method. 
+        # Use a DELETE query otherwise. 
+        from django.db.models import Model 
+        if not self.query.can_filter() or self.model is not None and self.model.delete != Model.delete:
+            for obj in del_query:
+                obj.delete()
+        else:
+            # Delete objects in chunks to prevent the list of related objects from
+            # becoming too long.
+            while 1:
+                # Collect all the objects to be deleted in this chunk, and all the
+                # objects that are related to the objects that are to be deleted.
+                seen_objs = CollectedObjects()
+                for object in del_query[:CHUNK_SIZE]:
+                    object._collect_sub_objects(seen_objs)
+    
+                if not seen_objs:
+                    break
+                delete_objects(seen_objs)
 
-        # Delete objects in chunks to prevent the list of related objects from
-        # becoming too long.
-        while 1:
-            # Collect all the objects to be deleted in this chunk, and all the
-            # objects that are related to the objects that are to be deleted.
-            seen_objs = CollectedObjects()
-            for object in del_query[:CHUNK_SIZE]:
-                object._collect_sub_objects(seen_objs)
-
-            if not seen_objs:
-                break
-            delete_objects(seen_objs)
-
         # Clear the result cache, in case this QuerySet gets reused.
         self._result_cache = None
     delete.alters_data = True

tests/regressiontests/queries/models.py

@@ -183 +183 @@
 class Related(models.Model):
     custom = models.ForeignKey(CustomPk)
 
+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.objects.create(name='t1')
 >>> t2 = Tag.objects.create(name='t2', parent=t1)
@@ -637 +647 @@
 >>> 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>]