summaryrefslogtreecommitdiff
path: root/django/db/models/expressions.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/expressions.py')
-rw-r--r--django/db/models/expressions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 93e72cfb18..f03a2736b3 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -748,7 +748,8 @@ class When(Expression):
def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
c = self.copy()
c.is_summary = summarize
- c.condition = c.condition.resolve_expression(query, allow_joins, reuse, summarize, False)
+ if hasattr(c.condition, 'resolve_expression'):
+ c.condition = c.condition.resolve_expression(query, allow_joins, reuse, summarize, False)
c.result = c.result.resolve_expression(query, allow_joins, reuse, summarize, for_save)
return c