Changeset 2902

Timestamp:

05/14/06 18:49:29 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1530 -- make count() respect distinct() on QuerySets?. Create some
tests for this as well. Thanks to Adam Endicott for the original patch on which
this is based.

Files:

• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/tests/modeltests/many_to_many/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/many_to_one/models.py (modified) (1 diff)

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

@@ -183 +183 @@
-        select, sql, params = counter._get_sql_clause()
-        cursor = connection.cursor()
-
+
+
+
+
+
+
-        return cursor.fetchone()[0]
-

django/trunk/tests/modeltests/many_to_many/models.py

@@ -83 +83 @@
-[NASA uses Python]
-
+# The count() function respects distinct() as well.
+>>> Article.objects.filter(publications__title__startswith="Science").count()
+2
+
+>>> Article.objects.filter(publications__title__startswith="Science").distinct().count()
+1
+
-# Reverse m2m queries are supported (i.e., starting at the table that doesn't
-# have a ManyToManyField).

django/trunk/tests/modeltests/many_to_one/models.py

@@ -205 +205 @@
->>> Reporter.objects.filter(article__headline__startswith='This').distinct()
-[John Smith]
+
+# Counting in the opposite direction works in conjunction with distinct()
+>>> Reporter.objects.filter(article__headline__startswith='This').count()
+3
+>>> Reporter.objects.filter(article__headline__startswith='This').distinct().count()
+1
-
-# Queries can go round in circles.