Changeset 9007

Timestamp:

09/10/08 21:00:27 (2 months ago)

Author:

mtredinnick

Message:

A bug from queryset-refactor days: although the Query class has "group_by" and
"having" attributes, only the former was included in the resulting SQL, meaning
subclasses had to completely duplicate Query.as_sql() if they were using any
kind of grouping filtering on the results.

Files:

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

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

@@ -293 +293 @@
-            result.append('GROUP BY %s' % ', '.join(grouping))
-
+        if self.having:
+            having, h_params = self.get_having()
+            result.append('HAVING %s' % ', '.join(having))
+            params.extend(h_params)
+
-        if ordering:
-            result.append('ORDER BY %s' % ', '.join(ordering))
@@ -573 +578 @@
-                result.append(str(col))
-        return result
+
+    def get_having(self):
+        """
+        Returns a tuple representing the SQL elements in the "having" clause.
+        By default, the elements of self.having have their as_sql() method
+        called or are returned unchanged (if they don't have an as_sql()
+        method).
+        """
+        result = []
+        params = []
+        for elt in self.having:
+            if hasattr(elt, 'as_sql'):
+                sql, params = elt.as_sql()
+                result.append(sql)
+                params.extend(params)
+            else:
+                result.append(elt)
+        return result, params
-
-    def get_ordering(self):

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

@@ -954 +954 @@
-1
-
+A check to ensure we don't break the internal query construction of GROUP BY
+and HAVING. These aren't supported in the public API, but the Query class knows
+about them and shouldn't do bad things.
+>>> qs = Tag.objects.values_list('parent_id', flat=True).order_by()
+>>> qs.query.group_by = ['parent_id']
+>>> qs.query.having = ['count(parent_id) > 1']
+>>> expected = [t3.parent_id, t4.parent_id]
+>>> expected.sort()
+>>> result = list(qs)
+>>> result.sort()
+>>> expected == result
+True
+
-"""}
-