Ticket #3566: queryset_modular_aggregates.diff

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

@@ -16 +16 @@
-from django.db.models import signals
-from django.db.models.fields import FieldDoesNotExist
-from django.db.models.query_utils import select_related_descend
-
+ as aggregates_module
-from django.db.models.sql.where import WhereNode, EverythingNode, AND, OR
-from django.core.exceptions import FieldError
-from datastructures import EmptyResultSet, Empty, MultiJoin
@@ -40 +40 @@
-
-    alias_prefix = 'T'
-    query_terms = QUERY_TERMS
-
+
+
-    def __init__(self, model, connection, where=WhereNode):
-        self.model = model
-        self.connection = connection
@@ -198 +199 @@
-            obj._setup_query()
-        return obj
-
+    def normalize(self, aggregate, value):
+        """
+        Returns a normalized Python object from the given aggregate object
+        and raw database value.
+        """
+        return self.connection.ops.db_aggregate_to_value(aggregate, value)
+
-    def results_iter(self):
-        """
-        Returns an iterator over the results from executing this query.
-        """
-        resolve_columns = hasattr(self, 'resolve_columns')
-        fields = None
-        normalize = self.connection.ops.db_aggregate_to_value
-        for rows in self.execute_sql(MULTI):
-            for row in rows:
-                if resolve_columns:
@@ -221 +228 @@
-                if self.aggregate_select:
-                    aggregate_start = len(self.extra_select.keys()) + len(self.select)
-                    row = row[:aggregate_start] + tuple(
-
+self.
-                        for (alias, aggregate), value
-                        in zip(self.aggregate_select.items(), row[aggregate_start:])
-                    )
@@ -263 +270 @@
-        query.select_related = False
-        query.related_select_cols = []
-        query.related_select_fields = []
-
-
+
-        return dict(
-
+self.
-            for (alias, aggregate), val
-            in zip(query.aggregate_select.items(), query.execute_sql(SINGLE))
-        )
@@ -1178 +1184 @@
-            aggregate_expr.lookup in self.aggregate_select.keys()):
-            # Aggregate is over an annotation
-            field_name = field_list[0]
-
+self.
-                col=field_name,
-                source=self.aggregate_select[field_name],
-                is_summary=is_summary)
@@ -1197 +1203 @@
-            for column_alias in join_list:
-                self.promote_alias(column_alias, unconditional=True)
-
-
+self.
-                col=(join_list[-1], col),
-                source=target,
-                is_summary=is_summary)
@@ -1211 +1217 @@
-                col = (opts.db_table, field.column)
-            else:
-                col = field_name
-
+self.
-                col=col,
-                source=field,
-                is_summary=is_summary)
@@ -1790 +1796 @@
-        """
-        if not self.distinct:
-            if not self.select:
-
+self.
-            else:
-                assert len(self.select) == 1, \
-                        "Cannot add count col with multiple cols in 'select': %r" % self.select
-
+self.
-        else:
-            opts = self.model._meta
-            if not self.select:
-
+self.
-                                         is_summary=True, distinct=True)
-            else:
-                # Because of SQL portability issues, multi-column, distinct
@@ -1806 +1812 @@
-                assert len(self.select) == 1, \
-                        "Cannot add count col with multiple cols in 'select'."
-
-
+self.
-            # Distinct handling is done in Count(), so don't do it at this
-            # level.
-            self.distinct = False