fix for #327 and #328

tests/test_inheritance_and_pydantic_generation/test_pydantic_fields_order.py

@@ -0,0 +1,41 @@
+import databases
+import pytest
+import sqlalchemy
+
+import ormar
+from tests.settings import DATABASE_URL
+
+metadata = sqlalchemy.MetaData()
+database = databases.Database(DATABASE_URL)
+
+
+class BaseMeta(ormar.ModelMeta):
+    database = database
+    metadata = metadata
+
+
+class TestModel(ormar.Model):
+    class Meta:
+        database = database
+        metadata = metadata
+
+    a: int = ormar.Integer(primary_key=True)
+    b: str = ormar.String(max_length=1)
+    c: str = ormar.String(max_length=1)
+    d: str = ormar.String(max_length=1)
+    e: str = ormar.String(max_length=1)
+    f: str = ormar.String(max_length=1)
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.drop_all(engine)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+def test_model_field_order():
+    TestCreate = TestModel.get_pydantic(exclude={"a"})
+    assert list(TestCreate.__fields__.keys()) == ["b", "c", "d", "e", "f"]