mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35019 -- Fixed save() on models with both GeneratedFields and ForeignKeys.

Browse Source 
Thanks Deb Kumar Das for the report.

Regression in f333e3513e.
This commit is contained in:
Sarah Boyce
2023-12-06 23:19:09 +01:00
committed by Mariusz Felisiak
parent eeb2119985
commit b287af5dc9
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
django/db/models/base.py
View File

@@ -781,7 +781,11 @@ class Model(AltersData, metaclass=ModelBase):
if force_insert and (force_update or update_fields):
raise ValueError("Cannot force both insert and updating in model saving.")
deferred_fields = self.get_deferred_fields()
deferred_non_generated_fields = {
f.attname
for f in self._meta.concrete_fields
if f.attname not in self.__dict__ and f.generated is False
}
if update_fields is not None:
# If update_fields is empty, skip the save. We do also check for
# no-op saves later on for inheritance cases. This bailout is
@@ -802,12 +806,16 @@ class Model(AltersData, metaclass=ModelBase):
# If saving to the same database, and this model is deferred, then
# automatically do an "update_fields" save on the loaded fields.
elif not force_insert and deferred_fields and using == self._state.db:
elif (
not force_insert
and deferred_non_generated_fields
and using == self._state.db
):
field_names = set()
for field in self._meta.concrete_fields:
if not field.primary_key and not hasattr(field, "through"):
field_names.add(field.attname)
loaded_fields = field_names.difference(deferred_fields)
loaded_fields = field_names.difference(deferred_non_generated_fields)
if loaded_fields:
update_fields = frozenset(loaded_fields)