WIP - Pydantic v2 support (#1238)

* WIP

* WIP - make test_model_definition tests pass

* WIP - make test_model_methods pass

* WIP - make whole test suit at least run - failing 49/443 tests

* WIP fix part of the getting pydantic tests as types of fields are now kept in core schema and not on fieldsinfo

* WIP fix validation in update by creating individual fields validators, failing 36/443

* WIP fix __pydantic_extra__ in intializing model, fix test related to pydantic config checks, failing 32/442

* WIP - fix enum schema in model_json_schema, failing 31/442

* WIP - fix copying through model, fix setting pydantic fields on through, fix default config and inheriting from it, failing 26/442

* WIP fix tests checking pydantic schema, fix excluding parent fields, failing 21/442

* WIP some missed files

* WIP - fix validators inheritance and fix validators in generated pydantic, failing 17/442

* WIP - fix through models setting - only on reverse side of relation, but always on reverse side, failing 15/442

* WIP - fix through models setting - only on reverse side of relation, but always on reverse side, failing 15/442

* WIP - working on proper populating __dict__ for relations for new schema dumping, some work on openapi docs, failing 13/442

* WIP - remove property fields as pydantic has now computed_field on its own, failing 9/442

* WIP - fixes in docs, failing 8/442

* WIP - fix tests for largebinary schema, wrapped bytes fields fail in pydantic, will be fixed in pydantic-core, remaining is circural schema for related models, failing 6/442

* WIP - fix to pk only models in schemas

* Getting test suites to pass (#1249)

* wip, fixing tests

* iteration, fixing some more tests

* iteration, fixing some more tests

* adhere to comments

* adhere to comments

* remove unnecessary dict call, re-add getattribute for testing

* todo for reverse relationship

* adhere to comments, remove prints

* solve circular refs

* all tests pass 🎉

* remove 3.7 from tests

* add lint and type check jobs

* reforat with ruff, fix jobs

* rename jobs

* fix imports

* fix evaluate in py3.8

* partially fix coverage

* fix coverage, add more tests

* fix test ids

* fix test ids

* fix lint, fix docs, make docs fully working scripts, add test docs job

* fix pyproject

* pin py ver in test docs

* change dir in test docs

* fix pydantic warning hack

* rm poetry call in test_docs

* switch to pathlib in test docs

* remove coverage req test docs

* fix type check tests, fix part of types

* fix/skip next part of types

* fix next part of types

* fix next part of types

* fix coverage

* fix coverage

* fix type (bit dirty 🤷)

* fix some code smells

* change pre-commit

* tweak workflows

* remove no root from tests

* switch to full python path by passing sys.executable

* some small refactor in new base model, one sample test, change makefile

* small refactors to reduce complexity of methods

* temp add tests for prs against pydantic_v2

* remove all references to __fields__

* remove all references to construct, deprecate the method and update model_construct to be in line with pydantic

* deprecate dict and add model_dump, todo switch to model_dict in calls

* fix tests

* change to union

* change to union

* change to model_dump and model_dump_json from dict and json deprecated methods, deprecate them in ormar too

* finish switching dict() -> model_dump()

* finish switching json() -> model_dump_json()

* remove fully pydantic_only

* switch to extra for payment card, change missed json calls

* fix coverage - no more warnings internal

* fix coverage - no more warnings internal - part 2

* split model_construct into own and pydantic parts

* split determine pydantic field type

* change to new field validators

* fix benchmarks, add codspeed instead of pytest-benchmark, add action and gh workflow

* restore pytest-benchmark

* remove codspeed

* pin pydantic version, restore codspeed

* change on push to pydantic_v2 to trigger first one

* Use lifespan function instead of event (#1259)

* check return types

* fix imports order, set warnings=False on json that passes the dict, fix unnecessary loop in one of the test

* remove references to model's meta as it's now ormar config, rename related methods too

* filter out pydantic serializer warnings

* remove choices leftovers

* remove leftovers after property_fields, keep only enough to exclude them in initialization

* add migration guide

* fix meta references

* downgrade databases for now

* Change line numbers in documentation (#1265)

* proofread and fix the docs, part 1

* proofread and fix the docs for models

* proofread and fix the docs for fields

* proofread and fix the docs for relations

* proofread and fix rest of the docs, add release notes for 0.20

* create tables in new docs src

* cleanup old deps, uncomment docs publish on tag

* fix import reorder

---------

Co-authored-by: TouwaStar <30479449+TouwaStar@users.noreply.github.com>
Co-authored-by: Goran Mekić <meka@tilda.center>

tests/test_model_methods/test_excludes_in_load_all.py

@@ -1,26 +1,16 @@
-import asyncio
 import uuid
 
+import ormar
 import pytest
 
-import ormar
-import sqlalchemy
-import databases
+from tests.lifespan import init_tests
+from tests.settings import create_config
 
-from tests.settings import DATABASE_URL
-
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
-
-
-class BaseMeta:
-    metadata = metadata
-    database = database
+base_ormar_config = create_config(force_rollback=True)
 
 
 class JimmyUser(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "jimmy_users"
+    ormar_config = base_ormar_config.copy(tablename="jimmy_users")
 
     id: uuid.UUID = ormar.UUID(
         primary_key=True, default=uuid.uuid4(), uuid_format="string"
@@ -28,42 +18,31 @@ class JimmyUser(ormar.Model):
 
 
 class JimmyProfile(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "jimmy_profiles"
+    ormar_config = base_ormar_config.copy(tablename="jimmy_profiles")
 
     id: uuid.UUID = ormar.UUID(
         primary_key=True, default=uuid.uuid4(), uuid_format="string"
     )
     name = ormar.String(max_length=42, default="JimmyProfile")
-
     user: JimmyUser = ormar.ForeignKey(to=JimmyUser)
 
 
 class JimmyAccount(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "jimmy_accounts"
+    ormar_config = base_ormar_config.copy(tablename="jimmy_accounts")
 
     id: uuid.UUID = ormar.UUID(
         primary_key=True, default=uuid.uuid4(), uuid_format="string"
     )
-
     name = ormar.String(max_length=42, default="JimmyAccount")
-
     user: JimmyUser = ormar.ForeignKey(to=JimmyUser)
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_excluding_one_relation():
-    async with database:
+    async with base_ormar_config.database:
         user = JimmyUser()
         await user.save()
 
@@ -77,7 +56,7 @@ async def test_excluding_one_relation():
 
 @pytest.mark.asyncio
 async def test_excluding_other_relation():
-    async with database:
+    async with base_ormar_config.database:
         user = JimmyUser()
         await user.save()
 

tests/test_model_methods/test_load_all.py

@@ -1,24 +1,16 @@
 from typing import List
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
 
-
-class BaseMeta(ormar.ModelMeta):
-    database = database
-    metadata = metadata
+base_ormar_config = create_config()
 
 
 class Language(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "languages"
+    ormar_config = base_ormar_config.copy(tablename="languages")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100)
@@ -26,8 +18,7 @@ class Language(ormar.Model):
 
 
 class CringeLevel(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "levels"
+    ormar_config = base_ormar_config.copy(tablename="levels")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100)
@@ -35,8 +26,7 @@ class CringeLevel(ormar.Model):
 
 
 class NickName(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "nicks"
+    ormar_config = base_ormar_config.copy(tablename="nicks")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -45,8 +35,7 @@ class NickName(ormar.Model):
 
 
 class HQ(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "hqs"
+    ormar_config = base_ormar_config.copy(tablename="hqs")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -54,8 +43,7 @@ class HQ(ormar.Model):
 
 
 class Company(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "companies"
+    ormar_config = base_ormar_config.copy(tablename="companies")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="company_name")
@@ -63,19 +51,13 @@ class Company(ormar.Model):
     hq: HQ = ormar.ForeignKey(HQ, related_name="companies")
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_load_all_fk_rel():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             hq = await HQ.objects.create(name="Main")
             company = await Company.objects.create(name="Banzai", founded=1988, hq=hq)
 
@@ -94,8 +76,8 @@ async def test_load_all_fk_rel():
 
 @pytest.mark.asyncio
 async def test_load_all_many_to_many():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             nick1 = await NickName.objects.create(name="BazingaO", is_lame=False)
             nick2 = await NickName.objects.create(name="Bazinga20", is_lame=True)
             hq = await HQ.objects.create(name="Main")
@@ -120,8 +102,8 @@ async def test_load_all_many_to_many():
 
 @pytest.mark.asyncio
 async def test_load_all_with_order():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             nick1 = await NickName.objects.create(name="Barry", is_lame=False)
             nick2 = await NickName.objects.create(name="Joe", is_lame=True)
             hq = await HQ.objects.create(name="Main")
@@ -154,8 +136,8 @@ async def test_load_all_with_order():
 
 @pytest.mark.asyncio
 async def test_loading_reversed_relation():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             hq = await HQ.objects.create(name="Main")
             await Company.objects.create(name="Banzai", founded=1988, hq=hq)
 
@@ -170,8 +152,8 @@ async def test_loading_reversed_relation():
 
 @pytest.mark.asyncio
 async def test_loading_nested():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             language = await Language.objects.create(name="English")
             level = await CringeLevel.objects.create(name="High", language=language)
             level2 = await CringeLevel.objects.create(name="Low", language=language)

tests/test_model_methods/test_populate_default_values.py

@@ -1,31 +1,26 @@
-import databases
-import pytest
-import sqlalchemy
+import ormar
 from sqlalchemy import text
 
-import ormar
-from tests.settings import DATABASE_URL
+from tests.lifespan import init_tests
+from tests.settings import create_config
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
-
-
-class BaseMeta(ormar.ModelMeta):
-    database = database
-    metadata = metadata
+base_ormar_config = create_config()
 
 
 class Task(ormar.Model):
-    class Meta(BaseMeta):
-        tablename = "tasks"
+    ormar_config = base_ormar_config.copy(tablename="tasks")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(
-        max_length=255, minimum=0, server_default=text("Default Name"), nullable=False
+        max_length=255, minimum=0, server_default=text("'Default Name'"), nullable=False
     )
     points: int = ormar.Integer(
         default=0, minimum=0, server_default=text("0"), nullable=False
     )
+    score: int = ormar.Integer(default=5)
+
+
+create_test_database = init_tests(base_ormar_config)
 
 
 def test_populate_default_values():
@@ -39,3 +34,4 @@ def test_populate_default_values():
     assert result["id"] is None
     assert result["name"] == ""
     assert result["points"] == 0
+    assert result["score"] == 5

tests/test_model_methods/test_save_related.py

@@ -1,31 +1,23 @@
 from typing import List
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
+
+base_ormar_config = create_config()
 
 
 class CringeLevel(ormar.Model):
-    class Meta:
-        tablename = "levels"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="levels")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100)
 
 
 class NickName(ormar.Model):
-    class Meta:
-        tablename = "nicks"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="nicks")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -34,17 +26,11 @@ class NickName(ormar.Model):
 
 
 class NicksHq(ormar.Model):
-    class Meta:
-        tablename = "nicks_x_hq"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="nicks_x_hq")
 
 
 class HQ(ormar.Model):
-    class Meta:
-        tablename = "hqs"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="hqs")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -52,10 +38,7 @@ class HQ(ormar.Model):
 
 
 class Company(ormar.Model):
-    class Meta:
-        tablename = "companies"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="companies")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="company_name")
@@ -63,19 +46,13 @@ class Company(ormar.Model):
     hq: HQ = ormar.ForeignKey(HQ, related_name="companies")
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_saving_related_fk_rel():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             hq = await HQ.objects.create(name="Main")
             comp = await Company.objects.create(name="Banzai", founded=1988, hq=hq)
             assert comp.saved
@@ -102,8 +79,8 @@ async def test_saving_related_fk_rel():
 
 @pytest.mark.asyncio
 async def test_saving_many_to_many():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             nick1 = await NickName.objects.create(name="BazingaO", is_lame=False)
             nick2 = await NickName.objects.create(name="Bazinga20", is_lame=True)
 
@@ -144,8 +121,8 @@ async def test_saving_many_to_many():
 
 @pytest.mark.asyncio
 async def test_saving_reversed_relation():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             hq = await HQ.objects.create(name="Main")
             await Company.objects.create(name="Banzai", founded=1988, hq=hq)
 
@@ -185,8 +162,8 @@ async def test_saving_reversed_relation():
 
 @pytest.mark.asyncio
 async def test_saving_nested():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             level = await CringeLevel.objects.create(name="High")
             level2 = await CringeLevel.objects.create(name="Low")
             nick1 = await NickName.objects.create(

tests/test_model_methods/test_save_related_from_dict.py

@@ -1,31 +1,23 @@
 from typing import List
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
+
+base_ormar_config = create_config()
 
 
 class CringeLevel(ormar.Model):
-    class Meta:
-        tablename = "levels"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="levels")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100)
 
 
 class NickName(ormar.Model):
-    class Meta:
-        tablename = "nicks"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="nicks")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -34,20 +26,14 @@ class NickName(ormar.Model):
 
 
 class NicksHq(ormar.Model):
-    class Meta:
-        tablename = "nicks_x_hq"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="nicks_x_hq")
 
     id: int = ormar.Integer(primary_key=True)
     new_field: str = ormar.String(max_length=200, nullable=True)
 
 
 class HQ(ormar.Model):
-    class Meta:
-        tablename = "hqs"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="hqs")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="hq_name")
@@ -55,10 +41,7 @@ class HQ(ormar.Model):
 
 
 class Company(ormar.Model):
-    class Meta:
-        tablename = "companies"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="companies")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="company_name")
@@ -66,19 +49,13 @@ class Company(ormar.Model):
     hq: HQ = ormar.ForeignKey(HQ, related_name="companies")
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_saving_related_reverse_fk():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {"companies": [{"name": "Banzai"}], "name": "Main"}
             hq = HQ(**payload)
             count = await hq.save_related(follow=True, save_all=True)
@@ -94,8 +71,8 @@ async def test_saving_related_reverse_fk():
 
 @pytest.mark.asyncio
 async def test_saving_related_reverse_fk_multiple():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {
                 "companies": [{"name": "Banzai"}, {"name": "Yamate"}],
                 "name": "Main",
@@ -116,8 +93,8 @@ async def test_saving_related_reverse_fk_multiple():
 
 @pytest.mark.asyncio
 async def test_saving_related_fk():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {"hq": {"name": "Main"}, "name": "Banzai"}
             comp = Company(**payload)
             count = await comp.save_related(follow=True, save_all=True)
@@ -132,8 +109,8 @@ async def test_saving_related_fk():
 
 @pytest.mark.asyncio
 async def test_saving_many_to_many_wo_through():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {
                 "name": "Main",
                 "nicks": [
@@ -155,9 +132,9 @@ async def test_saving_many_to_many_wo_through():
 
 @pytest.mark.asyncio
 async def test_saving_many_to_many_with_through():
-    async with database:
-        async with database.transaction(force_rollback=True):
-            async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
+            async with base_ormar_config.database.transaction(force_rollback=True):
                 payload = {
                     "name": "Main",
                     "nicks": [
@@ -189,8 +166,8 @@ async def test_saving_many_to_many_with_through():
 
 @pytest.mark.asyncio
 async def test_saving_nested_with_m2m_and_rev_fk():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {
                 "name": "Main",
                 "nicks": [
@@ -214,8 +191,8 @@ async def test_saving_nested_with_m2m_and_rev_fk():
 
 @pytest.mark.asyncio
 async def test_saving_nested_with_m2m_and_rev_fk_and_through():
-    async with database:
-        async with database.transaction(force_rollback=True):
+    async with base_ormar_config.database:
+        async with base_ormar_config.database.transaction(force_rollback=True):
             payload = {
                 "hq": {
                     "name": "Yoko",

tests/test_model_methods/test_save_related_uuid.py

@@ -1,30 +1,24 @@
 import uuid
 from typing import Optional
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
+
+base_ormar_config = create_config()
 
 
 class Department(ormar.Model):
-    class Meta:
-        database = database
-        metadata = metadata
+    ormar_config = base_ormar_config.copy()
 
     id: uuid.UUID = ormar.UUID(primary_key=True, default=uuid.uuid4)
     department_name: str = ormar.String(max_length=100)
 
 
 class Course(ormar.Model):
-    class Meta:
-        database = database
-        metadata = metadata
+    ormar_config = base_ormar_config.copy()
 
     id: uuid.UUID = ormar.UUID(primary_key=True, default=uuid.uuid4)
     course_name: str = ormar.String(max_length=100)
@@ -33,27 +27,19 @@ class Course(ormar.Model):
 
 
 class Student(ormar.Model):
-    class Meta:
-        database = database
-        metadata = metadata
+    ormar_config = base_ormar_config.copy()
 
     id: uuid.UUID = ormar.UUID(primary_key=True, default=uuid.uuid4)
     name: str = ormar.String(max_length=100)
     courses = ormar.ManyToMany(Course)
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_uuid_pk_in_save_related():
-    async with database:
+    async with base_ormar_config.database:
         to_save = {
             "department_name": "Ormar",
             "courses": [
@@ -80,4 +66,4 @@ async def test_uuid_pk_in_save_related():
             "id": ...,
             "courses": {"id": ..., "students": {"id", "studentcourse"}},
         }
-        assert department_check.dict(exclude=to_exclude) == to_save
+        assert department_check.model_dump(exclude=to_exclude) == to_save

tests/test_model_methods/test_update.py

@@ -1,21 +1,16 @@
 from typing import Optional
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
+
+base_ormar_config = create_config()
 
 
 class Director(ormar.Model):
-    class Meta:
-        tablename = "directors"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="directors")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="first_name")
@@ -23,10 +18,7 @@ class Director(ormar.Model):
 
 
 class Movie(ormar.Model):
-    class Meta:
-        tablename = "movies"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="movies")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="title")
@@ -35,18 +27,12 @@ class Movie(ormar.Model):
     director: Optional[Director] = ormar.ForeignKey(Director)
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_updating_selected_columns():
-    async with database:
+    async with base_ormar_config.database:
         director1 = await Director(name="Peter", last_name="Jackson").save()
         director2 = await Director(name="James", last_name="Cameron").save()
 
@@ -82,7 +68,7 @@ async def test_updating_selected_columns():
 
 @pytest.mark.asyncio
 async def test_not_passing_columns_or_empty_list_saves_all():
-    async with database:
+    async with base_ormar_config.database:
         director = await Director(name="James", last_name="Cameron").save()
         terminator = await Movie(
             name="Terminator", year=1984, director=director, profit=0.078

tests/test_model_methods/test_upsert.py

@@ -1,21 +1,16 @@
 from typing import Optional
 
-import databases
-import pytest
-import sqlalchemy
-
 import ormar
-from tests.settings import DATABASE_URL
+import pytest
 
-database = databases.Database(DATABASE_URL, force_rollback=True)
-metadata = sqlalchemy.MetaData()
+from tests.lifespan import init_tests
+from tests.settings import create_config
+
+base_ormar_config = create_config()
 
 
 class Director(ormar.Model):
-    class Meta:
-        tablename = "directors"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="directors")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="first_name")
@@ -23,10 +18,7 @@ class Director(ormar.Model):
 
 
 class Movie(ormar.Model):
-    class Meta:
-        tablename = "movies"
-        metadata = metadata
-        database = database
+    ormar_config = base_ormar_config.copy(tablename="movies")
 
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100, nullable=False, name="title")
@@ -35,18 +27,12 @@ class Movie(ormar.Model):
     director: Optional[Director] = ormar.ForeignKey(Director)
 
 
-@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)
+create_test_database = init_tests(base_ormar_config)
 
 
 @pytest.mark.asyncio
 async def test_updating_selected_columns():
-    async with database:
+    async with base_ormar_config.database:
         director1 = await Director(name="Peter", last_name="Jackson").save()
 
         await Movie(