From fa352626c2a80bcdcd0fc6492b5fd5130490f05e Mon Sep 17 00:00:00 2001 From: Tomáš Ehrlich Date: Thu, 1 Mar 2018 08:55:05 +0100 Subject: Fixed #29172 -- Fixed crash with Window expression in a subquery. --- django/db/models/expressions.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'django') 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): -- cgit v1.3