Code

Ticket #11305: poc_11305-3.patch

File poc_11305-3.patch, 27.8 KB (added by nate_b, 2 years ago)

Update for a clean apply.

  • django/db/models/aggregates.py

    diff --git a/django/db/models/aggregates.py b/django/db/models/aggregates.py
    index a2349cf..d816aa7 100644
    a b class Aggregate(object): 
    66    """ 
    77    Default Aggregate definition. 
    88    """ 
    9     def __init__(self, lookup, **extra): 
     9    def __init__(self, lookup, only=None, **extra): 
    1010        """Instantiate a new aggregate. 
    1111 
    1212         * lookup is the field on which the aggregate operates. 
     13         * only is a Q-object used in conditional aggregation. 
    1314         * extra is a dictionary of additional data to provide for the 
    1415           aggregate definition 
    1516 
    class Aggregate(object): 
    1819        """ 
    1920        self.lookup = lookup 
    2021        self.extra = extra 
     22        self.only = only 
     23        self.condition = None 
    2124 
    2225    def _default_alias(self): 
     26        if hasattr(self.lookup, 'evaluate'): 
     27             raise ValueError('When aggregating over an expression, you need to give an alias.') 
    2328        return '%s__%s' % (self.lookup, self.name.lower()) 
    2429    default_alias = property(_default_alias) 
    2530 
    class Aggregate(object): 
    4247           summary value rather than an annotation. 
    4348        """ 
    4449        klass = getattr(query.aggregates_module, self.name) 
    45         aggregate = klass(col, source=source, is_summary=is_summary, **self.extra) 
     50        aggregate = klass(col, source=source, is_summary=is_summary, condition=self.condition, **self.extra) 
    4651        query.aggregates[alias] = aggregate 
    4752 
    4853class Avg(Aggregate): 
  • django/db/models/expressions.py

    diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
    index a71f4a3..390f475 100644
    a b class ExpressionNode(tree.Node): 
    3939    # VISITOR METHODS # 
    4040    ################### 
    4141 
    42     def prepare(self, evaluator, query, allow_joins): 
    43         return evaluator.prepare_node(self, query, allow_joins) 
     42    def prepare(self, evaluator, query, allow_joins, promote_joins=False): 
     43        return evaluator.prepare_node(self, query, allow_joins, promote_joins) 
    4444 
    4545    def evaluate(self, evaluator, qn, connection): 
    4646        return evaluator.evaluate_node(self, qn, connection) 
    class F(ExpressionNode): 
    107107        obj.name = self.name 
    108108        return obj 
    109109 
    110     def prepare(self, evaluator, query, allow_joins): 
    111         return evaluator.prepare_leaf(self, query, allow_joins) 
     110    def prepare(self, evaluator, query, allow_joins, promote_joins=False): 
     111        return evaluator.prepare_leaf(self, query, allow_joins, promote_joins) 
    112112 
    113113    def evaluate(self, evaluator, qn, connection): 
    114114        return evaluator.evaluate_leaf(self, qn, connection) 
  • django/db/models/sql/aggregates.py

    diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py
    index 207bc0c..45f9104 100644
    a b  
    11""" 
    22Classes to represent the default SQL aggregate functions 
    33""" 
     4from django.db.models.sql.expressions import SQLEvaluator 
    45 
    56class AggregateField(object): 
    67    """An internal field mockup used to identify aggregates in the 
    class Aggregate(object): 
    2223    is_ordinal = False 
    2324    is_computed = False 
    2425    sql_template = '%(function)s(%(field)s)' 
     26    conditional_template = "CASE WHEN %(condition)s THEN %(field_name)s ELSE null END" 
    2527 
    26     def __init__(self, col, source=None, is_summary=False, **extra): 
     28    def __init__(self, col, source=None, is_summary=False, condition=None, **extra): 
    2729        """Instantiate an SQL aggregate 
    2830 
    2931         * col is a column reference describing the subject field 
    class Aggregate(object): 
    3335           the column reference. If the aggregate is not an ordinal or 
    3436           computed type, this reference is used to determine the coerced 
    3537           output type of the aggregate. 
     38         * condition is used in conditional aggregation 
    3639         * extra is a dictionary of additional data to provide for the 
    3740           aggregate definition 
    3841 
    class Aggregate(object): 
    5255        self.source = source 
    5356        self.is_summary = is_summary 
    5457        self.extra = extra 
     58        self.condition = condition 
    5559 
    5660        # Follow the chain of aggregate sources back until you find an 
    5761        # actual field, or an aggregate that forces a particular output 
    class Aggregate(object): 
    6670                tmp = computed_aggregate_field 
    6771            else: 
    6872                tmp = tmp.source 
    69  
     73         
     74        # We don't know the real source of this aggregate, and the 
     75        # aggregate doesn't define ordinal or computed either. So 
     76        # we default to computed for these cases.  
     77        if tmp is None: 
     78            tmp = computed_aggregate_field 
    7079        self.field = tmp 
    7180 
     81 
    7282    def relabel_aliases(self, change_map): 
    7383        if isinstance(self.col, (list, tuple)): 
    7484            self.col = (change_map.get(self.col[0], self.col[0]), self.col[1]) 
     85        else: 
     86            self.col.relabel_aliases(change_map) 
     87        if self.condition: 
     88            self.condition.relabel_aliases(change_map) 
    7589 
    7690    def as_sql(self, qn, connection): 
    7791        "Return the aggregate, rendered as SQL." 
    7892 
     93        condition_params = [] 
     94        col_params = [] 
    7995        if hasattr(self.col, 'as_sql'): 
    80             field_name = self.col.as_sql(qn, connection) 
     96            if isinstance(self.col, SQLEvaluator): 
     97                field_name, col_params = self.col.as_sql(qn, connection) 
     98            else: 
     99                field_name = self.col.as_sql(qn, connection) 
     100             
    81101        elif isinstance(self.col, (list, tuple)): 
    82102            field_name = '.'.join([qn(c) for c in self.col]) 
    83103        else: 
    84104            field_name = self.col 
    85  
    86         params = { 
    87             'function': self.sql_function, 
    88             'field': field_name 
    89         } 
     105        if self.condition: 
     106            condition, condition_params = self.condition.as_sql(qn, connection) 
     107            conditional_field = self.conditional_template % { 
     108                'condition': condition,  
     109                'field_name': field_name 
     110            }  
     111            params = { 
     112                'function': self.sql_function, 
     113                'field': conditional_field, 
     114            }  
     115        else: 
     116            params = { 
     117                'function': self.sql_function, 
     118                'field': field_name 
     119            } 
    90120        params.update(self.extra) 
    91  
    92         return self.sql_template % params 
     121        condition_params.extend(col_params) 
     122        return (self.sql_template % params, condition_params) 
    93123 
    94124 
    95125class Avg(Aggregate): 
  • django/db/models/sql/compiler.py

    diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
    index 72948f9..bf3cb25 100644
    a b class SQLCompiler(object): 
    6868        # as the pre_sql_setup will modify query state in a way that forbids 
    6969        # another run of it. 
    7070        self.refcounts_before = self.query.alias_refcount.copy() 
    71         out_cols = self.get_columns(with_col_aliases) 
     71        out_cols, c_params = self.get_columns(with_col_aliases) 
    7272        ordering, ordering_group_by = self.get_ordering() 
    7373 
    7474        distinct_fields = self.get_distinct() 
    class SQLCompiler(object): 
    8484        params = [] 
    8585        for val in self.query.extra_select.itervalues(): 
    8686            params.extend(val[1]) 
     87        # Extra-select comes before aggregation in the select list 
     88        params.extend(c_params) 
    8789 
    8890        result = ['SELECT'] 
    8991 
    class SQLCompiler(object): 
    178180        qn = self.quote_name_unless_alias 
    179181        qn2 = self.connection.ops.quote_name 
    180182        result = ['(%s) AS %s' % (col[0], qn2(alias)) for alias, col in self.query.extra_select.iteritems()] 
     183        query_params = [] 
    181184        aliases = set(self.query.extra_select.keys()) 
    182185        if with_aliases: 
    183186            col_aliases = aliases.copy() 
    class SQLCompiler(object): 
    220223            aliases.update(new_aliases) 
    221224 
    222225        max_name_length = self.connection.ops.max_name_length() 
    223         result.extend([ 
    224             '%s%s' % ( 
    225                 aggregate.as_sql(qn, self.connection), 
    226                 alias is not None 
    227                     and ' AS %s' % qn(truncate_name(alias, max_name_length)) 
    228                     or '' 
     226        for alias, aggregate in self.query.aggregate_select.items(): 
     227            sql, params = aggregate.as_sql(qn, self.connection) 
     228            result.append( 
     229                '%s%s' % ( 
     230                    sql, 
     231                    alias is not None 
     232                       and ' AS %s' % qn(truncate_name(alias, max_name_length)) 
     233                       or '' 
     234                ) 
    229235            ) 
    230             for alias, aggregate in self.query.aggregate_select.items() 
    231         ]) 
     236            query_params.extend(params) 
    232237 
    233238        for table, col in self.query.related_select_cols: 
    234239            r = '%s.%s' % (qn(table), qn(col)) 
    class SQLCompiler(object): 
    243248                col_aliases.add(col) 
    244249 
    245250        self._select_aliases = aliases 
    246         return result 
     251        return result, query_params 
    247252 
    248253    def get_default_columns(self, with_aliases=False, col_aliases=None, 
    249254            start_alias=None, opts=None, as_pairs=False, local_only=False): 
    class SQLAggregateCompiler(SQLCompiler): 
    10461051        """ 
    10471052        if qn is None: 
    10481053            qn = self.quote_name_unless_alias 
     1054        buf = [] 
     1055        a_params = [] 
     1056        for aggregate in self.query.aggregate_select.values(): 
     1057            sql, query_params = aggregate.as_sql(qn, self.connection) 
     1058            buf.append(sql) 
     1059            a_params.extend(query_params) 
     1060        aggregate_sql = ', '.join(buf) 
    10491061 
    10501062        sql = ('SELECT %s FROM (%s) subquery' % ( 
    1051             ', '.join([ 
    1052                 aggregate.as_sql(qn, self.connection) 
    1053                 for aggregate in self.query.aggregate_select.values() 
    1054             ]), 
     1063            aggregate_sql,   
    10551064            self.query.subquery) 
    10561065        ) 
    1057         params = self.query.sub_params 
     1066        params = tuple(a_params) + (self.query.sub_params) 
    10581067        return (sql, params) 
    10591068 
    10601069class SQLDateCompiler(SQLCompiler): 
  • django/db/models/sql/expressions.py

    diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py
    index 1bbf742..3df33f0 100644
    a b from django.db.models.fields import FieldDoesNotExist 
    33from django.db.models.sql.constants import LOOKUP_SEP 
    44 
    55class SQLEvaluator(object): 
    6     def __init__(self, expression, query, allow_joins=True): 
     6    def __init__(self, expression, query, allow_joins=True, promote_joins=False): 
    77        self.expression = expression 
    88        self.opts = query.get_meta() 
    99        self.cols = {} 
    1010 
    1111        self.contains_aggregate = False 
    12         self.expression.prepare(self, query, allow_joins) 
     12        self.expression.prepare(self, query, allow_joins, promote_joins) 
    1313 
    1414    def prepare(self): 
    1515        return self 
    class SQLEvaluator(object): 
    2828    # Vistor methods for initial expression preparation # 
    2929    ##################################################### 
    3030 
    31     def prepare_node(self, node, query, allow_joins): 
     31    def prepare_node(self, node, query, allow_joins, promote_joins): 
    3232        for child in node.children: 
    3333            if hasattr(child, 'prepare'): 
    34                 child.prepare(self, query, allow_joins) 
     34                child.prepare(self, query, allow_joins, promote_joins) 
    3535 
    36     def prepare_leaf(self, node, query, allow_joins): 
     36    def prepare_leaf(self, node, query, allow_joins, promote_joins): 
    3737        if not allow_joins and LOOKUP_SEP in node.name: 
    3838            raise FieldError("Joined field references are not permitted in this query") 
    3939 
    class SQLEvaluator(object): 
    4848                    field_list, query.get_meta(), 
    4949                    query.get_initial_alias(), False) 
    5050                col, _, join_list = query.trim_joins(source, join_list, last, False) 
     51                if promote_joins: 
     52                    for column_alias in join_list: 
     53                        query.promote_alias(column_alias, unconditional=True) 
    5154 
    5255                self.cols[node] = (join_list[-1], col) 
    5356            except FieldDoesNotExist: 
    class SQLEvaluator(object): 
    6568        for child in node.children: 
    6669            if hasattr(child, 'evaluate'): 
    6770                sql, params = child.evaluate(self, qn, connection) 
     71                if isinstance(sql, tuple): 
     72                    expression_params.extend(sql[1]) 
     73                    sql = sql[0] 
    6874            else: 
    6975                sql, params = '%s', (child,) 
    7076 
  • django/db/models/sql/query.py

    diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
    index ed2bc06..6074ed1 100644
    a b class Query(object): 
    987987        Adds a single aggregate expression to the Query 
    988988        """ 
    989989        opts = model._meta 
    990         field_list = aggregate.lookup.split(LOOKUP_SEP) 
    991         if len(field_list) == 1 and aggregate.lookup in self.aggregates: 
    992             # Aggregate is over an annotation 
    993             field_name = field_list[0] 
    994             col = field_name 
    995             source = self.aggregates[field_name] 
    996             if not is_summary: 
    997                 raise FieldError("Cannot compute %s('%s'): '%s' is an aggregate" % ( 
    998                     aggregate.name, field_name, field_name)) 
    999         elif ((len(field_list) > 1) or 
    1000             (field_list[0] not in [i.name for i in opts.fields]) or 
    1001             self.group_by is None or 
    1002             not is_summary): 
    1003             # If: 
    1004             #   - the field descriptor has more than one part (foo__bar), or 
    1005             #   - the field descriptor is referencing an m2m/m2o field, or 
    1006             #   - this is a reference to a model field (possibly inherited), or 
    1007             #   - this is an annotation over a model field 
    1008             # then we need to explore the joins that are required. 
    1009  
    1010             field, source, opts, join_list, last, _ = self.setup_joins( 
    1011                 field_list, opts, self.get_initial_alias(), False) 
    1012  
    1013             # Process the join chain to see if it can be trimmed 
    1014             col, _, join_list = self.trim_joins(source, join_list, last, False) 
    1015  
    1016             # If the aggregate references a model or field that requires a join, 
    1017             # those joins must be LEFT OUTER - empty join rows must be returned 
    1018             # in order for zeros to be returned for those aggregates. 
    1019             for column_alias in join_list: 
    1020                 self.promote_alias(column_alias, unconditional=True) 
    1021  
    1022             col = (join_list[-1], col) 
     990        only = aggregate.only 
     991        if hasattr(aggregate.lookup, 'evaluate'): 
     992            # If lookup is a query expression, evaluate it 
     993            col = SQLEvaluator(aggregate.lookup, self, promote_joins=True) 
     994            # TODO: find out the real source of this field. If any field has 
     995            # is_computed, then source can be set to is_computed. 
     996            source = None 
    1023997        else: 
    1024             # The simplest cases. No joins required - 
    1025             # just reference the provided column alias. 
    1026             field_name = field_list[0] 
    1027             source = opts.get_field(field_name) 
    1028             col = field_name 
    1029  
     998            field_list = aggregate.lookup.split(LOOKUP_SEP) 
     999            join_list = [] 
     1000            if len(field_list) == 1 and aggregate.lookup in self.aggregates: 
     1001                # Aggregate is over an annotation 
     1002                field_name = field_list[0] 
     1003                col = field_name 
     1004                source = self.aggregates[field_name] 
     1005                if not is_summary: 
     1006                    raise FieldError("Cannot compute %s('%s'): '%s' is an aggregate" % ( 
     1007                        aggregate.name, field_name, field_name)) 
     1008                if only: 
     1009                    raise FieldError("Cannot use aggregated fields in conditional aggregates") 
     1010            elif ((len(field_list) > 1) or 
     1011                (field_list[0] not in [i.name for i in opts.fields]) or 
     1012                self.group_by is None or 
     1013                not is_summary): 
     1014                # If: 
     1015                #   - the field descriptor has more than one part (foo__bar), or 
     1016                #   - the field descriptor is referencing an m2m/m2o field, or 
     1017                #   - this is a reference to a model field (possibly inherited), or 
     1018                #   - this is an annotation over a model field 
     1019                # then we need to explore the joins that are required. 
     1020 
     1021                field, source, opts, join_list, last, _ = self.setup_joins( 
     1022                    field_list, opts, self.get_initial_alias(), False) 
     1023 
     1024                # Process the join chain to see if it can be trimmed 
     1025                col, _, join_list = self.trim_joins(source, join_list, last, False) 
     1026 
     1027                # If the aggregate references a model or field that requires a join, 
     1028                # those joins must be LEFT OUTER - empty join rows must be returned 
     1029                # in order for zeros to be returned for those aggregates. 
     1030                for column_alias in join_list: 
     1031                    self.promote_alias(column_alias, unconditional=True) 
     1032 
     1033                col = (join_list[-1], col) 
     1034            else: 
     1035                # The simplest cases. No joins required - 
     1036                # just reference the provided column alias. 
     1037                field_name = field_list[0] 
     1038                source = opts.get_field(field_name) 
     1039                col = field_name 
     1040 
     1041        if only: 
     1042            original_where = self.where 
     1043            original_having = self.having 
     1044            aggregate.condition = self.where_class() 
     1045            self.where = aggregate.condition 
     1046            self.having = self.where_class() 
     1047            original_alias_map = self.alias_map.keys()[:] 
     1048            self.add_q(only, used_aliases=set(original_alias_map))  
     1049            if original_alias_map != self.alias_map.keys(): 
     1050                raise FieldError("Aggregate's only condition can not require additional joins, Original joins: %s, joins after: %s" % (original_alias_map, self.alias_map.keys())) 
     1051            if self.having.children: 
     1052                raise FieldError("Aggregate's only condition can not reference annotated fields") 
     1053            self.having = original_having 
     1054            self.where = original_where 
    10301055        # Add the aggregate to the query 
    10311056        aggregate.add_to_query(self, alias, col=col, source=source, is_summary=is_summary) 
    10321057 
  • django/db/models/sql/where.py

    diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
    index 1455ba6..8b530bd 100644
    a b class WhereNode(tree.Node): 
    139139        it. 
    140140        """ 
    141141        lvalue, lookup_type, value_annot, params_or_value = child 
     142        additional_params = [] 
    142143        if hasattr(lvalue, 'process'): 
    143144            try: 
    144145                lvalue, params = lvalue.process(lookup_type, params_or_value, connection) 
    class WhereNode(tree.Node): 
    153154        else: 
    154155            # A smart object with an as_sql() method. 
    155156            field_sql = lvalue.as_sql(qn, connection) 
     157            if isinstance(field_sql, tuple): 
     158                # It returned also params 
     159                additional_params.extend(field_sql[1]) 
     160                field_sql = field_sql[0] 
    156161 
    157162        if value_annot is datetime.datetime: 
    158163            cast_sql = connection.ops.datetime_cast_sql() 
    class WhereNode(tree.Node): 
    161166 
    162167        if hasattr(params, 'as_sql'): 
    163168            extra, params = params.as_sql(qn, connection) 
     169            if isinstance(extra, tuple): 
     170                params = params + tuple(extra[1]) 
     171                extra = extra[0] 
    164172            cast_sql = '' 
    165173        else: 
    166174            extra = '' 
    class WhereNode(tree.Node): 
    170178            lookup_type = 'isnull' 
    171179            value_annot = True 
    172180 
     181        additional_params.extend(params) 
     182        params = additional_params 
    173183        if lookup_type in connection.operators: 
    174184            format = "%s %%s %%s" % (connection.ops.lookup_cast(lookup_type),) 
    175185            return (format % (field_sql, 
  • tests/modeltests/aggregation/tests.py

    diff --git a/tests/modeltests/aggregation/tests.py b/tests/modeltests/aggregation/tests.py
    index a35dbb3..058ba80 100644
    a b import datetime 
    44from decimal import Decimal 
    55 
    66from django.db.models import Avg, Sum, Count, Max, Min 
     7from django.db.models import Q, F 
     8from django.core.exceptions import FieldError 
    79from django.test import TestCase, Approximate 
    810 
    911from .models import Author, Publisher, Book, Store 
    class BaseAggregateTestCase(TestCase): 
    1820    def test_single_aggregate(self): 
    1921        vals = Author.objects.aggregate(Avg("age")) 
    2022        self.assertEqual(vals, {"age__avg": Approximate(37.4, places=1)}) 
     23        vals = Author.objects.aggregate(Sum("age", only=Q(age__gt=29))) 
     24        self.assertEqual(vals, {"age__sum": 254}) 
     25        vals = Author.objects.extra(select={'testparams':'age < %s'}, select_params=[0])\ 
     26               .aggregate(Sum("age", only=Q(age__gt=29))) 
     27        self.assertEqual(vals, {"age__sum": 254}) 
     28        vals = Author.objects.aggregate(Sum("age", only=Q(name__icontains='jaco')|Q(name__icontains='adrian'))) 
     29        self.assertEqual(vals, {"age__sum": 69})  
    2130 
    2231    def test_multiple_aggregates(self): 
    2332        vals = Author.objects.aggregate(Sum("age"), Avg("age")) 
    2433        self.assertEqual(vals, {"age__sum": 337, "age__avg": Approximate(37.4, places=1)}) 
     34        vals = Author.objects.aggregate(Sum("age", only=Q(age__gt=29)), Avg("age")) 
     35        self.assertEqual(vals, {"age__sum": 254, "age__avg": Approximate(37.4, places=1)}) 
    2536 
    2637    def test_filter_aggregate(self): 
    2738        vals = Author.objects.filter(age__gt=29).aggregate(Sum("age")) 
    2839        self.assertEqual(len(vals), 1) 
    2940        self.assertEqual(vals["age__sum"], 254) 
     41        vals = Author.objects.filter(age__gt=29).aggregate(Sum("age", only=Q(age__lt=29))) 
     42        # If there are no matching aggregates, then None, not 0 is the answer. 
     43        self.assertEqual(vals["age__sum"], None) 
    3044 
    3145    def test_related_aggregate(self): 
    3246        vals = Author.objects.aggregate(Avg("friends__age")) 
    3347        self.assertEqual(len(vals), 1) 
    3448        self.assertAlmostEqual(vals["friends__age__avg"], 34.07, places=2) 
    3549 
     50        vals = Author.objects.aggregate(Avg("friends__age", only=Q(age__lt=29))) 
     51        self.assertEqual(len(vals), 1) 
     52        self.assertAlmostEqual(vals["friends__age__avg"], 33.67, places=2) 
     53        vals2 = Author.objects.filter(age__lt=29).aggregate(Avg("friends__age")) 
     54        self.assertEqual(vals, vals2) 
     55 
     56        vals = Author.objects.aggregate(Avg("friends__age", only=Q(friends__age__lt=35))) 
     57        self.assertEqual(len(vals), 1) 
     58        self.assertAlmostEqual(vals["friends__age__avg"], 28.75, places=2) 
     59 
     60        # The average age of author's friends, whose age is lower than the authors age. 
     61        vals = Author.objects.aggregate(Avg("friends__age", only=Q(friends__age__lt=F('age')))) 
     62        self.assertEqual(len(vals), 1) 
     63        self.assertAlmostEqual(vals["friends__age__avg"], 30.43, places=2) 
     64 
    3665        vals = Book.objects.filter(rating__lt=4.5).aggregate(Avg("authors__age")) 
    3766        self.assertEqual(len(vals), 1) 
    3867        self.assertAlmostEqual(vals["authors__age__avg"], 38.2857, places=2) 
    class BaseAggregateTestCase(TestCase): 
    5382        vals = Store.objects.aggregate(Max("books__authors__age")) 
    5483        self.assertEqual(len(vals), 1) 
    5584        self.assertEqual(vals["books__authors__age__max"], 57) 
     85         
     86        vals = Store.objects.aggregate(Max("books__authors__age", only=Q(books__authors__age__lt=56))) 
     87        self.assertEqual(len(vals), 1) 
     88        self.assertEqual(vals["books__authors__age__max"], 46) 
    5689 
    5790        vals = Author.objects.aggregate(Min("book__publisher__num_awards")) 
    5891        self.assertEqual(len(vals), 1) 
    class BaseAggregateTestCase(TestCase): 
    84117        ) 
    85118        self.assertEqual(b.mean_age, 34.5) 
    86119 
     120        # Test extra-select 
     121        books = Book.objects.annotate(mean_age=Avg("authors__age")) 
     122        books = books.annotate(mean_age2=Avg('authors__age', only=Q(authors__age__gte=0))) 
     123        books = books.extra(select={'testparams': 'publisher_id = %s'}, select_params=[1]) 
     124        b = books.get(pk=1) 
     125        self.assertEqual(b.mean_age, 34.5) 
     126        self.assertEqual(b.mean_age2, 34.5) 
     127        self.assertEqual(b.testparams, True) 
     128 
     129        # Test relabel_aliases 
     130        excluded_authors = Author.objects.annotate(book_rating=Min(F('book__rating') + 5, only=Q(pk__gte=1))) 
     131        excluded_authors = excluded_authors.filter(book_rating__lt=0) 
     132        books = books.exclude(authors__in=excluded_authors) 
     133        b = books.get(pk=1) 
     134        self.assertEqual(b.mean_age, 34.5) 
     135 
     136        # Test joins in F-based annotation 
     137        books = Book.objects.annotate(oldest=Max(F('authors__age'))) 
     138        books = books.values_list('rating', 'oldest').order_by('rating', 'oldest') 
     139        self.assertEqual( 
     140            list(books), 
     141            [(3.0, 45), (4.0, 29), (4.0, 37), (4.0, 57), (4.5, 35), (5.0, 57)] 
     142        ) 
     143 
     144        publishers = Publisher.objects.annotate(avg_rating=Avg(F('book__rating') - 0)) 
     145        publishers = publishers.values_list('id', 'avg_rating').order_by('id') 
     146        self.assertEqual(list(publishers), [(1, 4.25), (2, 3.0), (3, 4.0), (4, 5.0), (5, None)]) 
     147 
    87148    def test_annotate_m2m(self): 
    88149        books = Book.objects.filter(rating__lt=4.5).annotate(Avg("authors__age")).order_by("name") 
    89150        self.assertQuerysetEqual( 
    class BaseAggregateTestCase(TestCase): 
    108169            ], 
    109170            lambda b: (b.name, b.num_authors) 
    110171        ) 
     172         
     173        def raises_exception(): 
     174            list(Book.objects.annotate(num_authors=Count("authors")).annotate(num_authors2=Count("authors", only=Q(num_authors__gt=1))).order_by("name")) 
     175 
     176        self.assertRaises(FieldError, raises_exception) 
    111177 
    112178    def test_backwards_m2m_annotate(self): 
    113179        authors = Author.objects.filter(name__contains="a").annotate(Avg("book__rating")).order_by("name") 
    class BaseAggregateTestCase(TestCase): 
    194260                } 
    195261            ] 
    196262        ) 
     263        books = Book.objects.filter(pk=1).annotate(mean_age=Avg('authors__age', only=Q(authors__age__lt=35))).values('pk', 'isbn', 'mean_age') 
     264        self.assertEqual( 
     265            list(books), [ 
     266                { 
     267                    "pk": 1, 
     268                    "isbn": "159059725", 
     269                    "mean_age": 34.0, 
     270                } 
     271            ] 
     272        ) 
    197273 
    198274        books = Book.objects.filter(pk=1).annotate(mean_age=Avg("authors__age")).values("name") 
    199275        self.assertEqual( 
    class BaseAggregateTestCase(TestCase): 
    271347 
    272348        vals = Book.objects.aggregate(Count("rating", distinct=True)) 
    273349        self.assertEqual(vals, {"rating__count": 4}) 
     350        vals = Book.objects.aggregate( 
     351            low_count=Count("rating", only=Q(rating__lt=4)),  
     352            high_count=Count("rating", only=Q(rating__gte=4)) 
     353        ) 
     354        self.assertEqual(vals, {"low_count": 1, 'high_count': 5}) 
     355        vals = Book.objects.aggregate( 
     356            low_count=Count("rating", distinct=True, only=Q(rating__lt=4)),  
     357            high_count=Count("rating", distinct=True, only=Q(rating__gte=4)) 
     358        ) 
     359        self.assertEqual(vals, {"low_count": 1, 'high_count': 3}) 
    274360 
    275361    def test_fkey_aggregate(self): 
    276362        explicit = list(Author.objects.annotate(Count('book__id'))) 
    class BaseAggregateTestCase(TestCase): 
    390476            ], 
    391477            lambda p: p.name, 
    392478        ) 
     479        publishers = Publisher.objects.annotate(num_books=Count("book__id", only=Q(book__id__gt=5))).filter(num_books__gt=1, book__price__lt=Decimal("40.0")).order_by("pk") 
     480        self.assertQuerysetEqual( 
     481            publishers, [ 
     482                "Expensive Publisher", 
     483            ], 
     484            lambda p: p.name, 
     485        ) 
    393486 
    394487        publishers = Publisher.objects.filter(book__price__lt=Decimal("40.0")).annotate(num_books=Count("book__id")).filter(num_books__gt=1).order_by("pk") 
    395488        self.assertQuerysetEqual(