p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only call flatten() once & address some review comments

This commit is contained in:
David Sanders 2022-09-23 17:46:57 +10:00
parent 328bede9fb
commit 7cbffe6e42
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/db/models/query_utils.py
View File

@ -156,17 +156,18 @@ class Q(tree.Node):
Retrieve all base fields referenced directly or through F expressions excluding Retrieve all base fields referenced directly or through F expressions excluding
any fields referenced through joins. any fields referenced through joins.
""" """
# Avoid circular imports # Avoid circular imports.
from django.db.models import F from django.db.models import F
f_references = set(expr.name for expr in self.flatten() if isinstance(expr, F)) expressions = list(self.flatten())
q_references = set( f_references = {expr.name for expr in expressions if isinstance(expr, F)}
q_references = {
child[0].split(LOOKUP_SEP)[0] child[0].split(LOOKUP_SEP)[0]
for expr in self.flatten() for expr in expressions
if isinstance(expr, Q) if isinstance(expr, Q)
for child in expr.children for child in expr.children
if isinstance(child, tuple) if isinstance(child, tuple)
) }
return f_references | q_references return f_references | q_references