From bf12273db4e53779546e2ac7b65c0ce8e3c8a640 Mon Sep 17 00:00:00 2001 From: Alex Aktsipetrov Date: Thu, 5 Dec 2019 19:08:47 +0300 Subject: Fixed #31060 -- Reallowed window expressions to be used in conditions outside of queryset filters. Regression in 4edad1ddf6203326e0be4bdb105beecb0fe454c4. Thanks utapyngo for the report. --- django/db/models/sql/query.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 8fee6b0183..af1ea8b84b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1190,7 +1190,7 @@ class Query(BaseExpression): def build_filter(self, filter_expr, branch_negated=False, current_negated=False, can_reuse=None, allow_joins=True, split_subq=True, - reuse_with_filtered_relation=False): + reuse_with_filtered_relation=False, check_filterable=True): """ Build a WhereNode for a single filter clause but don't add it to this Query. Query.add_q() will then add this filter to the where @@ -1229,6 +1229,7 @@ class Query(BaseExpression): used_aliases=can_reuse, allow_joins=allow_joins, split_subq=split_subq, + check_filterable=check_filterable, ) if hasattr(filter_expr, 'resolve_expression'): if not getattr(filter_expr, 'conditional', False): @@ -1244,7 +1245,8 @@ class Query(BaseExpression): raise FieldError("Cannot parse keyword query %r" % arg) lookups, parts, reffed_expression = self.solve_lookup_type(arg) - self.check_filterable(reffed_expression) + if check_filterable: + self.check_filterable(reffed_expression) if not allow_joins and len(parts) > 1: raise FieldError("Joined field references are not permitted in this query") @@ -1253,7 +1255,8 @@ class Query(BaseExpression): value = self.resolve_lookup_value(value, can_reuse, allow_joins) used_joins = {k for k, v in self.alias_refcount.items() if v > pre_joins.get(k, 0)} - self.check_filterable(value) + if check_filterable: + self.check_filterable(value) clause = self.where_class() if reffed_expression: @@ -1349,7 +1352,8 @@ class Query(BaseExpression): return self.build_filter(filter_expr, allow_joins=False)[0] def _add_q(self, q_object, used_aliases, branch_negated=False, - current_negated=False, allow_joins=True, split_subq=True): + current_negated=False, allow_joins=True, split_subq=True, + check_filterable=True): """Add a Q-object to the current filter.""" connector = q_object.connector current_negated = current_negated ^ q_object.negated @@ -1361,7 +1365,7 @@ class Query(BaseExpression): child_clause, needed_inner = self.build_filter( child, can_reuse=used_aliases, branch_negated=branch_negated, current_negated=current_negated, allow_joins=allow_joins, - split_subq=split_subq, + split_subq=split_subq, check_filterable=check_filterable, ) joinpromoter.add_votes(needed_inner) if child_clause: -- cgit v1.3