Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progress in removing resolving_relation_name as it's wrong for multiple related columns leading to same model

Browse Source
This commit is contained in:
collerek
2020-12-21 12:03:59 +01:00
parent 2d74b7bd47
commit 514e8c4ad5
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ormar/relations/querysetproxy.py
View File

@ -33,9 +33,11 @@ class QuerysetProxy(ormar.QuerySetProtocol):
self._queryset: Optional["QuerySet"] = qryset
self.type_: "RelationType" = type_
self._owner: "Model" = self.relation.manager.owner
self.related_field = self._owner.resolve_relation_field(
self.relation.to, self._owner
self.related_field_name = (
self._owner.Meta.model_fields[self.relation.field_name].related_name
or self._owner.get_name() + "s"
)
self.related_field = self.relation.to.Meta.model_fields[self.related_field_name]
self.owner_pk_value = self._owner.pk
@property

2
ormar/relations/relation.py
View File

@ -54,7 +54,7 @@ class Relation:
field_name=self.field_name,
data_=cleaned_data,
)
relation_name = self._owner.resolve_relation_name(self._owner, self.to)
relation_name = self.field_name
self._owner.__dict__[relation_name] = cleaned_data
self._to_remove = set()