Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

#fixed #2256 -- Made count() interact with slicing on QuerySets. Patc…

…h from

SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d123588184dfecc286e8e06e16dc0383f435c051 1 parent 80e58b3
@malcolmt malcolmt authored
Showing with 25 additions and 2 deletions.
  1. +14 −2 django/db/models/query.py
  2. +11 −0 tests/modeltests/lookup/models.py
View
16 django/db/models/query.py
@@ -197,9 +197,12 @@ def count(self):
"Performs a SELECT COUNT() and returns the number of records as an integer."
counter = self._clone()
counter._order_by = ()
+ counter._select_related = False
+
+ offset = counter._offset
+ limit = counter._limit
counter._offset = None
counter._limit = None
- counter._select_related = False
try:
select, sql, params = counter._get_sql_clause()
@@ -213,7 +216,16 @@ def count(self):
cursor.execute("SELECT COUNT(DISTINCT(%s))" % id_col + sql, params)
else:
cursor.execute("SELECT COUNT(*)" + sql, params)
- return cursor.fetchone()[0]
+ count = cursor.fetchone()[0]
+
+ # Apply any offset and limit constraints manually, since using LIMIT or
+ # OFFSET in SQL doesn't change the output of COUNT.
+ if offset:
+ count = max(0, count - offset)
+ if limit:
+ count = min(limit, count)
+
+ return count
def get(self, *args, **kwargs):
"Performs the SELECT and returns a single object matching the given keyword arguments."
View
11 tests/modeltests/lookup/models.py
@@ -58,6 +58,17 @@ def __str__(self):
>>> Article.objects.filter(headline__startswith='Blah blah').count()
0L
+# count() should respect sliced query sets.
+>>> articles = Article.objects.all()
+>>> articles.count()
+7L
+>>> articles[:4].count()
+4
+>>> articles[1:100].count()
+6L
+>>> articles[10:100].count()
+0
+
# Date and date/time lookups can also be done with strings.
>>> Article.objects.filter(pub_date__exact='2005-07-27 00:00:00').count()
3L
Please sign in to comment.
Something went wrong with that request. Please try again.