Ticket #12328: bug12328.patch

django/db/models/sql/compiler.py

@@ -130 +130 @@
         Used when nesting this query inside another.
         """
         obj = self.query.clone()
-        obj.clear_ordering(True)
+        if obj.low_mark == 0 and obj.high_mark is None:
+            obj.clear_ordering(True)
         obj.bump_prefix()
         return obj.get_compiler(connection=self.connection).as_sql()
 

django/db/models/query.py

@@ -10 +10 @@
 from django.db.models.query_utils import Q, select_related_descend, CollectedObjects, CyclicDependency, deferred_class_factory, InvalidQuery
 from django.db.models import signals, sql
 from django.utils.copycompat import deepcopy
+from django.db.sql.where import WhereNode
 
 # Used to control how many objects are worked with at once in some cases (e.g.
 # when deleting objects).
@@ -407 +408 @@
         qs.query.add_filter(('pk__in', id_list))
         return dict([(obj._get_pk_val(), obj) for obj in qs.iterator()])
 
+    def _verify_before_delete(self, children = []):
+        for child in children:
+            if isinstance(child, tuple):
+                if isinstance(child[-1], QuerySet):
+                    assert child[-1].query.can_filter(), \
+                           "Cannot use 'limit' or 'offset' with delete."
+            elif isinstance(child, WhereNode):
+                self._verify_before_delete(child.children)
+
     def delete(self):
         """
         Deletes the records in the current QuerySet.
@@ -414 +424 @@
         assert self.query.can_filter(), \
                 "Cannot use 'limit' or 'offset' with delete."
 
+        self._verify_before_delete(self.query.where.children)
+
         del_query = self._clone()
 
         # The delete is actually 2 queries - one to find related objects,

tests/regressiontests/bug12328/tests.py

@@ +1 @@
+from unittest import TestCase
+from models import Bug12328
+
+class TestBug12328(TestCase):
+    def test_delete(self):
+        Bug12328.objects.create(id=1)
+        Bug12328.objects.create(id=2)
+        Bug12328.objects.create(id=3)
+        expected = Bug12328.objects.filter(id__in=[2,3])
+        Bug12328.objects.filter(id=1).delete()
+        self.assertEquals(expected.__repr__(), Bug12328.objects.all().__repr__())
+        Bug12328.objects.create(id=1)
+        exp_element = Bug12328.objects.order_by('id')[0:1]
+        query = Bug12328.objects.filter(id__in=Bug12328.objects.order_by('id')[0:1].values_list('id', flat=True))
+        query2 = Bug12328.objects.filter(id__in=Bug12328.objects.order_by('id')[0:1])
+        self.assertEquals(exp_element.__repr__(), query.__repr__(), query2.__repr__())
+        # Catch the exception
+        try:
+            Bug12328.objects.filter(id__in=Bug12328.objects.order_by('id')[0:1]).delete()
+        except AssertionError, e:
+            self.assertEquals(str(e), "Cannot use 'limit' or 'offset' with delete.")

tests/regressiontests/bug12328/models.py

@@ +1 @@
+from django.db import models
+
+# Create your models here.
+
+class Bug12328(models.Model):
+    def __unicode__(self):
+        return 'M(id=%d)' % self.id