mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-24 20:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #28930 -- Simplified code with any() and all().

Browse source
This commit is contained in:
Дилян Палаузов 2017-12-27 00:14:12 +05:30 • committed by Tim Graham
parent c21f158295
commit 4c599ece57
18 changed files with 54 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

15
django/db/models/expressions.py
View file

@ -200,24 +200,15 @@ class BaseExpression:
@cached_property
def contains_aggregate(self):
for expr in self.get_source_expressions():
if expr and expr.contains_aggregate:
return True
return False
return any(expr and expr.contains_aggregate for expr in self.get_source_expressions())
@cached_property
def contains_over_clause(self):
for expr in self.get_source_expressions():
if expr and expr.contains_over_clause:
return True
return False
return any(expr and expr.contains_over_clause for expr in self.get_source_expressions())
@cached_property
def contains_column_references(self):
for expr in self.get_source_expressions():
if expr and expr.contains_column_references:
return True
return False
return any(expr and expr.contains_column_references for expr in self.get_source_expressions())
def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
"""