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

Refs #32095 -- Added model's Options._non_pk_concrete_field_names property.

This commit is contained in:
sarahboyce 2022-09-29 20:19:38 +02:00 committed by Mariusz Felisiak
parent 9b0c9821ed
commit 1d77b931f7
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,15 +799,7 @@ class Model(metaclass=ModelBase):
return return
update_fields = frozenset(update_fields) update_fields = frozenset(update_fields)
field_names = set() field_names = self._meta._non_pk_concrete_field_names
for field in self._meta.concrete_fields:
if not field.primary_key:
field_names.add(field.name)
if field.name != field.attname:
field_names.add(field.attname)
non_model_fields = update_fields.difference(field_names) non_model_fields = update_fields.difference(field_names)
if non_model_fields: if non_model_fields:

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

@ -89,6 +89,7 @@ class Options:
"many_to_many", "many_to_many",
"concrete_fields", "concrete_fields",
"local_concrete_fields", "local_concrete_fields",
"_non_pk_concrete_field_names",
"_forward_fields_map", "_forward_fields_map",
"managers", "managers",
"managers_map", "managers_map",
@ -982,6 +983,19 @@ class Options:
names.append(name) names.append(name)
return frozenset(names) return frozenset(names)
@cached_property
def _non_pk_concrete_field_names(self):
"""
Return a set of the non-pk concrete field names defined on the model.
"""
names = []
for field in self.concrete_fields:
if not field.primary_key:
names.append(field.name)
if field.name != field.attname:
names.append(field.attname)
return frozenset(names)
@cached_property @cached_property
def db_returning_fields(self): def db_returning_fields(self):
""" """