summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTomáš Ehrlich <tomas.ehrlich@gmail.com>2018-03-01 08:55:05 +0100
committerTim Graham <timograham@gmail.com>2018-03-01 10:24:14 -0500
commitfa352626c2a80bcdcd0fc6492b5fd5130490f05e (patch)
tree52004cfda1e319a800b4550cc3296ad683b0bec4 /django
parentba4a9862407c8e8574c60b9f911f6b09aff1fa12 (diff)
Fixed #29172 -- Fixed crash with Window expression in a subquery.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/expressions.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 307ee97db5..4ce869d80a 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -315,8 +315,10 @@ class BaseExpression:
def relabeled_clone(self, change_map):
clone = self.copy()
- clone.set_source_expressions(
- [e.relabeled_clone(change_map) for e in self.get_source_expressions()])
+ clone.set_source_expressions([
+ e.relabeled_clone(change_map) if e is not None else None
+ for e in self.get_source_expressions()
+ ])
return clone
def copy(self):