Changeset 7787

Timestamp:

06/29/08 06:50:04 (3 months ago)

Author:

mtredinnick

Message:

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

Files:

• django/trunk/django/db/models/sql/query.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)

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

@@ -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:

django/trunk/tests/regressiontests/queries/models.py

@@ -338 +338 @@
-4
->>> xx.delete()
+
+Bug #7323
+>>> Item.objects.values('creator', 'name').count()
+4
-
-Bug #2253