Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

A way better fix for the count() issue in [7787].

The first attempt was brain-damaged. Let's never speak of it again.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f62e5a1fba0c711706264d6b2ce2f5cd6b2c5073 1 parent 18d89cc
@malcolmt malcolmt authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 django/db/models/sql/query.py
View
4 django/db/models/sql/query.py
@@ -218,7 +218,7 @@ def get_count(self):
obj.select_related = False
obj.related_select_cols = []
obj.related_select_fields = []
- if obj.distinct and len(obj.select) > 1:
+ if len(obj.select) > 1:
obj = self.clone(CountQuery, _query=obj, where=self.where_class(),
distinct=False)
obj.select = []
@@ -1484,6 +1484,8 @@ 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
Please sign in to comment.
Something went wrong with that request. Please try again.