Changeset 7788

Timestamp:

06/29/08 18:47:31 (2 months ago)

Author:

mtredinnick

Message:

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

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

Files:

• django/trunk/django/db/models/sql/query.py (modified) (2 diffs)

django/trunk/django/db/models/sql/query.py

@@ -219 +219 @@
-        obj.related_select_cols = []
-        obj.related_select_fields = []
-obj.distinct and 
+
-            obj = self.clone(CountQuery, _query=obj, where=self.where_class(),
-                    distinct=False)
@@ -1485 +1485 @@
-                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: