fix for #327 and #328

2021-09-01 11:50:04 +02:00
parent 47f2d61786
commit 46500eba39
5 changed files with 55 additions and 4 deletions
--- a/ormar/init.py
+++ b/ormar/init.py
@ -77,7 +77,7 @@ class UndefinedType:  # pragma no cover

 Undefined = UndefinedType()

-__version__ = "0.10.17"
+__version__ = "0.10.18"
 __all__ = [
    "Integer",
    "BigInteger",
--- a/ormar/models/mixins/pydantic_mixin.py
+++ b/ormar/models/mixins/pydantic_mixin.py
@ -64,6 +64,9 @@ class PydanticMixin(RelationMixin):
        fields_to_process = cls._get_not_excluded_fields(
            fields={*cls.Meta.model_fields.keys()}, include=include, exclude=exclude
        )
+        fields_to_process.sort(
+            key=lambda x: list(cls.Meta.model_fields.keys()).index(x)
+        )
        for name in fields_to_process:
            field = cls._determine_pydantic_field_type(
                name=name,