mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Fixed #35950 -- Restored refreshing of relations when fields deferred.
Thank you to Simon Charette and Sarah Boyce for the review.
Regression in 73df8b54a2.
This commit is contained in:
committed by
Sarah Boyce
parent
32b9e00b0c
commit
2f6b096b83
@@ -726,12 +726,13 @@ class Model(AltersData, metaclass=ModelBase):
|
||||
if fields is not None:
|
||||
db_instance_qs = db_instance_qs.only(*fields)
|
||||
elif deferred_fields:
|
||||
fields = {
|
||||
f.attname
|
||||
for f in self._meta.concrete_fields
|
||||
if f.attname not in deferred_fields
|
||||
}
|
||||
db_instance_qs = db_instance_qs.only(*fields)
|
||||
db_instance_qs = db_instance_qs.only(
|
||||
*{
|
||||
f.attname
|
||||
for f in self._meta.concrete_fields
|
||||
if f.attname not in deferred_fields
|
||||
}
|
||||
)
|
||||
|
||||
db_instance = db_instance_qs.get()
|
||||
non_loaded_fields = db_instance.get_deferred_fields()
|
||||
@@ -748,9 +749,9 @@ class Model(AltersData, metaclass=ModelBase):
|
||||
field.delete_cached_value(self)
|
||||
|
||||
# Clear cached relations.
|
||||
for field in self._meta.related_objects:
|
||||
if (fields is None or field.name in fields) and field.is_cached(self):
|
||||
field.delete_cached_value(self)
|
||||
for rel in self._meta.related_objects:
|
||||
if (fields is None or rel.name in fields) and rel.is_cached(self):
|
||||
rel.delete_cached_value(self)
|
||||
|
||||
# Clear cached private relations.
|
||||
for field in self._meta.private_fields:
|
||||
|
||||
Reference in New Issue
Block a user