fix excluding default values in nested model fields in prefetch_related
This commit is contained in:
@ -200,7 +200,7 @@ class Model(NewBaseModel):
|
||||
if not self.pk and self.Meta.model_fields[self.Meta.pkname].autoincrement:
|
||||
self_fields.pop(self.Meta.pkname, None)
|
||||
self_fields = self.populate_default_values(self_fields)
|
||||
self.from_dict(
|
||||
self.update_from_dict(
|
||||
{
|
||||
k: v
|
||||
for k, v in self_fields.items()
|
||||
@ -274,7 +274,7 @@ class Model(NewBaseModel):
|
||||
|
||||
async def update(self: T, **kwargs: Any) -> T:
|
||||
if kwargs:
|
||||
self.from_dict(kwargs)
|
||||
self.update_from_dict(kwargs)
|
||||
|
||||
if not self.pk:
|
||||
raise ModelPersistenceError(
|
||||
@ -309,6 +309,6 @@ class Model(NewBaseModel):
|
||||
raise NoMatch("Instance was deleted from database and cannot be refreshed")
|
||||
kwargs = dict(row)
|
||||
kwargs = self.translate_aliases_to_columns(kwargs)
|
||||
self.from_dict(kwargs)
|
||||
self.update_from_dict(kwargs)
|
||||
self.set_save_status(True)
|
||||
return self
|
||||
|
||||
@ -351,7 +351,7 @@ class NewBaseModel(
|
||||
|
||||
return dict_instance
|
||||
|
||||
def from_dict(self, value_dict: Dict) -> "NewBaseModel":
|
||||
def update_from_dict(self, value_dict: Dict) -> "NewBaseModel":
|
||||
for key, value in value_dict.items():
|
||||
setattr(self, key, value)
|
||||
return self
|
||||
|
||||
@ -33,7 +33,7 @@ quick_access_set = {
|
||||
"delete",
|
||||
"dict",
|
||||
"extract_related_names",
|
||||
"from_dict",
|
||||
"update_from_dict",
|
||||
"get_column_alias",
|
||||
"get_column_name_from_alias",
|
||||
"get_filtered_names_to_extract",
|
||||
|
||||
Reference in New Issue
Block a user