From f97a6123c07de5099fdf8b7d00ef7d20ed354e07 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Fri, 15 Nov 2019 00:24:21 -0500 Subject: [PATCH] Refs #25367 -- Made Query.build_filter() raise TypeError on non-conditional expressions. --- django/db/models/sql/query.py | 4 +++- tests/queries/test_query.py | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index dcf897c649..8fee6b0183 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1230,7 +1230,9 @@ class Query(BaseExpression): allow_joins=allow_joins, split_subq=split_subq, ) - if hasattr(filter_expr, 'resolve_expression') and getattr(filter_expr, 'conditional', False): + if hasattr(filter_expr, 'resolve_expression'): + if not getattr(filter_expr, 'conditional', False): + raise TypeError('Cannot filter against a non-conditional expression.') condition = self.build_lookup( ['exact'], filter_expr.resolve_expression(self, allow_joins=allow_joins), True ) diff --git a/tests/queries/test_query.py b/tests/queries/test_query.py index 9d18b15f3c..523fa607f0 100644 --- a/tests/queries/test_query.py +++ b/tests/queries/test_query.py @@ -144,3 +144,9 @@ class TestQuery(SimpleTestCase): msg = 'Joined field references are not permitted in this query' with self.assertRaisesMessage(FieldError, msg): query.build_where(filter_expr) + + def test_filter_non_conditional(self): + query = Query(Item) + msg = 'Cannot filter against a non-conditional expression.' + with self.assertRaisesMessage(TypeError, msg): + query.build_where(Func(output_field=CharField()))