mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-04 11:09:13 +00:00
Code Issues 32 Releases Wiki Activity

Refs #28900 -- Made Query.has_select_fields a computed property.

Browse Source 
This should ensure it never drifts from Query.selected while maintaining
backward compatibility.
This commit is contained in:
Simon Charette 2024-06-21 02:07:54 -04:00 committed by Sarah Boyce
parent 6d220963fa
commit 0e65abd2d9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/sql/query.py
View File

@ -260,7 +260,6 @@ class Query(BaseExpression):
select_for_update_of = () select_for_update_of = ()
select_for_no_key_update = False select_for_no_key_update = False
select_related = False select_related = False
has_select_fields = False
# Arbitrary limit for select_related to prevents infinite recursion. # Arbitrary limit for select_related to prevents infinite recursion.
max_depth = 5 max_depth = 5
# Holds the selects defined by a call to values() or values_list() # Holds the selects defined by a call to values() or values_list()
@ -2448,11 +2447,14 @@ class Query(BaseExpression):
self.extra_select_mask = set(names) self.extra_select_mask = set(names)
self._extra_select_cache = None self._extra_select_cache = None
@property
def has_select_fields(self):
return self.selected is not None
def set_values(self, fields): def set_values(self, fields):
self.select_related = False self.select_related = False
self.clear_deferred_loading() self.clear_deferred_loading()
self.clear_select_fields() self.clear_select_fields()
self.has_select_fields = True
selected = {} selected = {}
if fields: if fields: