* 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>
211 lines
6.2 KiB
Python
211 lines
6.2 KiB
Python
import ormar
|
|
from ormar.queryset.queries.prefetch_query import sort_models
|
|
from ormar.queryset.utils import (
|
|
subtract_dict,
|
|
translate_list_to_dict,
|
|
update,
|
|
update_dict_from_list,
|
|
)
|
|
|
|
from tests.lifespan import init_tests
|
|
from tests.settings import create_config
|
|
|
|
base_ormar_config = create_config()
|
|
|
|
|
|
def test_list_to_dict_translation():
|
|
tet_list = ["aa", "bb", "cc__aa", "cc__bb", "cc__aa__xx", "cc__aa__yy"]
|
|
test = translate_list_to_dict(tet_list)
|
|
assert test == {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx": Ellipsis, "yy": Ellipsis}, "bb": Ellipsis},
|
|
}
|
|
|
|
|
|
def test_updating_dict_with_list():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx": Ellipsis, "yy": Ellipsis}, "bb": Ellipsis},
|
|
}
|
|
list_to_update = ["ee", "bb__cc", "cc__aa__xx__oo", "cc__aa__oo"]
|
|
test = update_dict_from_list(curr_dict, list_to_update)
|
|
assert test == {
|
|
"aa": Ellipsis,
|
|
"bb": {"cc": Ellipsis},
|
|
"cc": {
|
|
"aa": {"xx": {"oo": Ellipsis}, "yy": Ellipsis, "oo": Ellipsis},
|
|
"bb": Ellipsis,
|
|
},
|
|
"ee": Ellipsis,
|
|
}
|
|
|
|
|
|
def test_updating_dict_inc_set_with_list():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx", "yy"}, "bb": Ellipsis},
|
|
}
|
|
list_to_update = ["uu", "bb__cc", "cc__aa__xx__oo", "cc__aa__oo"]
|
|
test = update_dict_from_list(curr_dict, list_to_update)
|
|
assert test == {
|
|
"aa": Ellipsis,
|
|
"bb": {"cc": Ellipsis},
|
|
"cc": {
|
|
"aa": {"xx": {"oo": Ellipsis}, "yy": Ellipsis, "oo": Ellipsis},
|
|
"bb": Ellipsis,
|
|
},
|
|
"uu": Ellipsis,
|
|
}
|
|
|
|
|
|
def test_updating_dict_inc_set_with_dict():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx", "yy"}, "bb": Ellipsis},
|
|
}
|
|
dict_to_update = {
|
|
"uu": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {"aa": {"xx": {"oo": Ellipsis}, "oo": Ellipsis}},
|
|
}
|
|
test = update(curr_dict, dict_to_update)
|
|
assert test == {
|
|
"aa": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {
|
|
"aa": {"xx": {"oo": Ellipsis}, "yy": Ellipsis, "oo": Ellipsis},
|
|
"bb": Ellipsis,
|
|
},
|
|
"uu": Ellipsis,
|
|
}
|
|
|
|
|
|
def test_subtracting_dict_inc_set_with_dict():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx", "yy"}, "bb": Ellipsis},
|
|
}
|
|
dict_to_update = {
|
|
"uu": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {"aa": {"xx": {"oo": Ellipsis}}, "bb": Ellipsis},
|
|
}
|
|
test = subtract_dict(curr_dict, dict_to_update)
|
|
assert test == {"aa": Ellipsis, "cc": {"aa": {"yy": Ellipsis}}}
|
|
|
|
|
|
def test_updating_dict_inc_set_with_dict_inc_set():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx", "yy"}, "bb": Ellipsis},
|
|
}
|
|
dict_to_update = {
|
|
"uu": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {"aa": {"xx", "oo", "zz", "ii"}},
|
|
}
|
|
test = update(curr_dict, dict_to_update)
|
|
assert test == {
|
|
"aa": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {"aa": {"xx", "yy", "oo", "zz", "ii"}, "bb": Ellipsis},
|
|
"uu": Ellipsis,
|
|
}
|
|
|
|
|
|
def test_subtracting_dict_inc_set_with_dict_inc_set():
|
|
curr_dict = {
|
|
"aa": Ellipsis,
|
|
"bb": Ellipsis,
|
|
"cc": {"aa": {"xx", "yy"}, "bb": Ellipsis},
|
|
"dd": {"aa", "bb"},
|
|
}
|
|
dict_to_update = {
|
|
"aa": Ellipsis,
|
|
"bb": {"cc", "dd"},
|
|
"cc": {"aa": {"xx", "oo", "zz", "ii"}},
|
|
"dd": {"aa", "bb"},
|
|
}
|
|
test = subtract_dict(curr_dict, dict_to_update)
|
|
assert test == {"cc": {"aa": {"yy"}, "bb": Ellipsis}}
|
|
|
|
|
|
def test_subtracting_with_set_and_dict():
|
|
curr_dict = {
|
|
"translation": {
|
|
"filters": {
|
|
"values": Ellipsis,
|
|
"reports": {"report": {"charts": {"chart": Ellipsis}}},
|
|
},
|
|
"translations": {"language": Ellipsis},
|
|
"filtervalues": {
|
|
"filter": {"reports": {"report": {"charts": {"chart": Ellipsis}}}}
|
|
},
|
|
},
|
|
"chart": {
|
|
"reports": {
|
|
"report": {
|
|
"filters": {
|
|
"filter": {
|
|
"translation": {
|
|
"translations": {"language": Ellipsis},
|
|
"filtervalues": Ellipsis,
|
|
},
|
|
"values": {
|
|
"translation": {"translations": {"language": Ellipsis}}
|
|
},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
}
|
|
dict_to_update = {
|
|
"chart": Ellipsis,
|
|
"translation": {"filters", "filtervalues", "chartcolumns"},
|
|
}
|
|
test = subtract_dict(curr_dict, dict_to_update)
|
|
assert test == {"translation": {"translations": {"language": Ellipsis}}}
|
|
|
|
|
|
class SortModel(ormar.Model):
|
|
ormar_config = base_ormar_config.copy(tablename="sorts")
|
|
|
|
id: int = ormar.Integer(primary_key=True)
|
|
name: str = ormar.String(max_length=100)
|
|
sort_order: int = ormar.Integer()
|
|
|
|
|
|
def test_sorting_models():
|
|
models = [
|
|
SortModel(id=1, name="Alice", sort_order=0),
|
|
SortModel(id=2, name="Al", sort_order=1),
|
|
SortModel(id=3, name="Zake", sort_order=1),
|
|
SortModel(id=4, name="Will", sort_order=0),
|
|
SortModel(id=5, name="Al", sort_order=2),
|
|
SortModel(id=6, name="Alice", sort_order=2),
|
|
]
|
|
orders_by = {"name": "asc", "none": {}, "sort_order": "desc"}
|
|
models = sort_models(models, orders_by)
|
|
assert models[5].name == "Zake"
|
|
assert models[0].name == "Al"
|
|
assert models[1].name == "Al"
|
|
assert [model.id for model in models] == [5, 2, 6, 1, 4, 3]
|
|
|
|
orders_by = {"name": "asc", "none": set("aa"), "id": "asc"}
|
|
models = sort_models(models, orders_by)
|
|
assert [model.id for model in models] == [2, 5, 1, 6, 4, 3]
|
|
|
|
orders_by = {"sort_order": "asc", "none": ..., "id": "asc", "uu": 2, "aa": None}
|
|
models = sort_models(models, orders_by)
|
|
assert [model.id for model in models] == [1, 4, 2, 3, 5, 6]
|
|
|
|
|
|
create_test_database = init_tests(base_ormar_config)
|