Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #10202 -- Fixed another couple of slicing edge-cases wi…

…th querysets.

Patch from Alex Gaynor and Ramiro Morales.

Backport of r9924 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 283c89e4c61fa99dfdf6688a12ed3ce5a3945347 1 parent 9b5b2ee
@malcolmt malcolmt authored
View
4 django/db/models/sql/query.py
@@ -240,7 +240,7 @@ def get_count(self):
# in SQL (in variants that provide them) doesn't change the COUNT
# output.
number = max(0, number - self.low_mark)
- if self.high_mark:
+ if self.high_mark is not None:
number = min(number, self.high_mark - self.low_mark)
return number
@@ -1534,7 +1534,7 @@ def can_filter(self):
Typically, this means no limits or offsets have been put on the results.
"""
- return not (self.low_mark or self.high_mark)
+ return not self.low_mark and self.high_mark is None
def clear_select_fields(self):
"""
View
8 tests/regressiontests/queries/models.py
@@ -902,11 +902,17 @@ def __unicode__(self):
>>> Item.objects.filter(created__in=[time1, time2])
[<Item: one>, <Item: two>]
-Bug #7698 -- People like to slice with '0' as the high-water mark.
+Bug #7698, #10202 -- People like to slice with '0' as the high-water mark.
>>> Item.objects.all()[0:0]
[]
>>> Item.objects.all()[0:0][:10]
[]
+>>> Item.objects.all()[:0].count()
+0
+>>> Item.objects.all()[:0].latest('created')
+Traceback (most recent call last):
+ ...
+AssertionError: Cannot change a query once a slice has been taken.
Bug #7411 - saving to db must work even with partially read result set in
another cursor.
Please sign in to comment.
Something went wrong with that request. Please try again.