Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #7323 -- Fixed a count() edge-case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 18d89cc1f759bc926a2fa7a613c46d46fe3ca81f 1 parent 050d0a1
@malcolmt malcolmt authored
View
2  django/db/models/sql/query.py
@@ -1484,8 +1484,6 @@ def add_count_column(self):
if not self.select:
select = Count()
else:
- assert len(self.select) == 1, \
- "Cannot add count col with multiple cols in 'select': %r" % self.select
select = Count(self.select[0])
else:
opts = self.model._meta
View
4 tests/regressiontests/queries/models.py
@@ -338,6 +338,10 @@ class Related(models.Model):
4
>>> xx.delete()
+Bug #7323
+>>> Item.objects.values('creator', 'name').count()
+4
+
Bug #2253
>>> q1 = Item.objects.order_by('name')
>>> q2 = Item.objects.filter(id=i1.id)
Please sign in to comment.
Something went wrong with that request. Please try again.