bug fixes

tests/test_fastapi/test_m2m_forwardref.py

@@ -0,0 +1,109 @@
+from typing import List, Optional
+
+import databases
+import pytest
+import sqlalchemy
+from fastapi import FastAPI
+from pydantic.schema import ForwardRef
+from starlette import status
+from starlette.testclient import TestClient
+
+import ormar
+
+app = FastAPI()
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+app.state.database = database
+
+
+@app.on_event("startup")
+async def startup() -> None:
+    database_ = app.state.database
+    if not database_.is_connected:
+        await database_.connect()
+
+
+@app.on_event("shutdown")
+async def shutdown() -> None:
+    database_ = app.state.database
+    if database_.is_connected:
+        await database_.disconnect()
+
+
+class BaseMeta(ormar.ModelMeta):
+    database = database
+    metadata = metadata
+
+
+CityRef = ForwardRef("City")
+CountryRef = ForwardRef("Country")
+
+
+# models.py
+class Country(ormar.Model):
+    class Meta(BaseMeta):
+        tablename = "countries"
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=128, unique=True)
+    iso2: str = ormar.String(max_length=3)
+    iso3: str = ormar.String(max_length=4, unique=True)
+    population: int = ormar.Integer(maximum=10000000000)
+    demonym: str = ormar.String(max_length=128)
+    native_name: str = ormar.String(max_length=128)
+    capital: Optional[CityRef] = ormar.ForeignKey(  # type: ignore
+        CityRef, related_name="capital_city", nullable=True
+    )
+    borders: List[Optional[CountryRef]] = ormar.ManyToMany(  # type: ignore
+        CountryRef, nullable=True, skip_reverse=True
+    )
+
+
+class City(ormar.Model):
+    class Meta(BaseMeta):
+        tablename = "cities"
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=128)
+    country: Country = ormar.ForeignKey(
+        Country, related_name="cities", skip_reverse=True
+    )
+
+
+Country.update_forward_refs()
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@app.post("/", response_model=Country, status_code=status.HTTP_201_CREATED)
+async def create_country(country: Country):  # if this is ormar
+    result = await country.upsert()  # it's already initialized as ormar model
+    return result
+
+
+def test_payload():
+    client = TestClient(app)
+    with client as client:
+        payload = {
+            "name": "Thailand",
+            "iso2": "TH",
+            "iso3": "THA",
+            "population": 23123123,
+            "demonym": "Thai",
+            "native_name": "Thailand",
+        }
+        resp = client.post("/", json=payload, headers={"application-type": "json"})
+        print(resp.content)
+        assert resp.status_code == 201
+
+        resp_country = Country(**resp.json())
+        assert resp_country.name == "Thailand"

tests/test_model_definition/test_create_uses_init_for_consistency.py

@@ -0,0 +1,63 @@
+import uuid
+from typing import ClassVar
+
+import databases
+import pytest
+import sqlalchemy
+from pydantic import root_validator
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class BaseMeta(ormar.ModelMeta):
+    database = database
+    metadata = metadata
+
+
+class Mol(ormar.Model):
+    # fixed namespace to generate always unique uuid from the smiles
+    _UUID_NAMESPACE: ClassVar[uuid.UUID] = uuid.UUID(
+        "12345678-abcd-1234-abcd-123456789abc"
+    )
+
+    class Meta(BaseMeta):
+        tablename = "mols"
+
+    id: str = ormar.UUID(primary_key=True, index=True, uuid_format="hex")
+    smiles: str = ormar.String(nullable=False, unique=True, max_length=256)
+
+    def __init__(self, **kwargs):
+        # this is required to generate id from smiles in init, if id is not given
+        if "id" not in kwargs:
+            kwargs["id"] = self._UUID_NAMESPACE
+        super().__init__(**kwargs)
+
+    @root_validator()
+    def make_canonical_smiles_and_uuid(cls, values):
+        values["id"], values["smiles"] = cls.uuid(values["smiles"])
+        return values
+
+    @classmethod
+    def uuid(cls, smiles):
+        id = uuid.uuid5(cls._UUID_NAMESPACE, smiles)
+        return id, smiles
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_json_column():
+    async with database:
+        await Mol.objects.create(smiles="Cc1ccccc1")
+        count = await Mol.objects.count()
+        assert count == 1

tests/test_model_definition/test_models.py

@@ -199,7 +199,7 @@ async def test_binary_column():
 async def test_binary_str_column():
     async with database:
         async with database.transaction(force_rollback=True):
-            await LargeBinaryStr.objects.create(test_binary=blob3)
+            await LargeBinaryStr(test_binary=blob3).save()
             await LargeBinaryStr.objects.create(test_binary=blob4)
 
             items = await LargeBinaryStr.objects.all()