WIP add owner to fields and simplify relation names

2021-01-09 16:13:53 +01:00
parent 8b794d07f9
commit 055c99ba02
7 changed files with 188 additions and 150 deletions
--- a/ormar/models/newbasemodel.py
+++ b/ormar/models/newbasemodel.py
@ -446,12 +446,10 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
        globalns.setdefault(cls.__name__, cls)
        fields_to_check = cls.Meta.model_fields.copy()
        for field_name, field in fields_to_check.items():
-            if issubclass(field, ForeignKeyField):
+            if field.has_unresolved_forward_refs():
                field.evaluate_forward_ref(globalns=globalns, localns=localns)
-                expand_reverse_relationship(
-                    model=cls,  # type: ignore
-                    model_field=field,
-                )
+                field.set_self_reference_flag()
+                expand_reverse_relationship(model_field=field)
                register_relation_in_alias_manager(
                    cls,  # type: ignore
                    field,