summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-06-29 11:50:04 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-06-29 11:50:04 +0000
commit18d89cc1f759bc926a2fa7a613c46d46fe3ca81f (patch)
treee68ef63ae3c5b4fdf5d6d1c04daaf179daaf3210 /django/db/models/sql/query.py
parent050d0a1b75add2240760c4ba09f1fdd6e9a677f0 (diff)
Fixed #7323 -- Fixed a count() edge-case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 0575f91a9f..b0c58b969a 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1484,8 +1484,6 @@ class Query(object):
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