finish release notes, add more test

tests/test_model_definition/test_fields_access.py

@@ -112,11 +112,11 @@ def test_operator_return_proper_filter_action(method, expected, expected_value):
 
     group_ = getattr(PriceList.categories.products.rating, method)("Test")
     assert group_._kwargs_dict == {
-        f"categories__products__rating__{expected}": expected_value}
+        f"categories__products__rating__{expected}": expected_value
+    }
 
 
-@pytest.mark.parametrize("method, expected_direction",
-                         [("asc", ""), ("desc", "desc"), ])
+@pytest.mark.parametrize("method, expected_direction", [("asc", ""), ("desc", "desc"),])
 def test_operator_return_proper_order_action(method, expected_direction):
     action = getattr(Product.name, method)()
     assert action.source_model == Product
@@ -141,17 +141,20 @@ def test_combining_groups_together():
     group = (Product.name == "Test") & (Product.rating >= 3.0)
     group.resolve(model_cls=Product)
     assert len(group._nested_groups) == 2
-    assert str(group.get_text_clause()) == ("( ( product.name = 'Test' ) AND"
-                                            " ( product.rating >= 3.0 ) )")
+    assert str(group.get_text_clause()) == (
+        "( ( product.name = 'Test' ) AND" " ( product.rating >= 3.0 ) )"
+    )
 
     group = ~((Product.name == "Test") & (Product.rating >= 3.0))
     group.resolve(model_cls=Product)
     assert len(group._nested_groups) == 2
-    assert str(group.get_text_clause()) == (" NOT ( ( product.name = 'Test' ) AND"
-                                            " ( product.rating >= 3.0 ) )")
+    assert str(group.get_text_clause()) == (
+        " NOT ( ( product.name = 'Test' ) AND" " ( product.rating >= 3.0 ) )"
+    )
 
     group = ((Product.name == "Test") & (Product.rating >= 3.0)) | (
-            Product.category.name << (["Toys", "Books"]))
+        Product.category.name << (["Toys", "Books"])
+    )
     group.resolve(model_cls=Product)
     assert len(group._nested_groups) == 2
     assert len(group._nested_groups[0]._nested_groups) == 2
@@ -159,22 +162,27 @@ def test_combining_groups_together():
     category_prefix = group._nested_groups[1].actions[0].table_prefix
     assert group_str == (
         "( ( ( product.name = 'Test' ) AND ( product.rating >= 3.0 ) ) "
-        f"OR ( {category_prefix}_categories.name IN ('Toys', 'Books') ) )")
+        f"OR ( {category_prefix}_categories.name IN ('Toys', 'Books') ) )"
+    )
 
     group = (Product.name % "Test") | (
-        (Product.category.price_lists.name.startswith("Aa")) | (
-                    Product.category.name << (["Toys", "Books"])))
+        (Product.category.price_lists.name.startswith("Aa"))
+        | (Product.category.name << (["Toys", "Books"]))
+    )
     group.resolve(model_cls=Product)
     assert len(group._nested_groups) == 2
     assert len(group._nested_groups[1]._nested_groups) == 2
     group_str = str(group.get_text_clause())
-    price_list_prefix = group._nested_groups[1]._nested_groups[0].actions[
-        0].table_prefix
+    price_list_prefix = (
+        group._nested_groups[1]._nested_groups[0].actions[0].table_prefix
+    )
     category_prefix = group._nested_groups[1]._nested_groups[1].actions[0].table_prefix
     assert group_str == (
         f"( ( product.name LIKE '%Test%' ) "
         f"OR ( ( {price_list_prefix}_price_lists.name LIKE 'Aa%' ) "
-        f"OR ( {category_prefix}_categories.name IN ('Toys', 'Books') ) ) )")
+        f"OR ( {category_prefix}_categories.name IN ('Toys', 'Books') ) ) )"
+    )
+
 
 # @pytest.mark.asyncio
 # async def test_filtering_by_field_access():
@@ -195,9 +203,6 @@ def test_combining_groups_together():
 # * overload operators and add missing functions that return FilterAction (V)
 # * return OrderAction for desc() and asc() (V)
 # * create filter groups for & and | (and ~ - NOT?) (V)
-
-# * accept args in all functions that accept filters? or only filter and exclude?
+# * accept args in all functions that accept filters? or only filter and exclude? (V)
 # all functions: delete, first, get, get_or_none, get_or_create, all, filter, exclude
-# and same from queryset, should they also accept filter groups?
-# * accept OrderActions in order_by
-#
+# * accept OrderActions in order_by (V)

tests/test_model_definition/test_pydantic_fields.py

@@ -0,0 +1,66 @@
+from typing import Optional
+
+import databases
+import pytest
+import sqlalchemy
+from pydantic import EmailStr, HttpUrl, ValidationError
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL)
+metadata = sqlalchemy.MetaData()
+
+
+class BaseMeta(ormar.ModelMeta):
+    metadata = metadata
+    database = database
+
+
+class Test(ormar.Model):
+    class Meta(BaseMeta):
+        pass
+
+    def __init__(self, **kwargs):
+        # you need to pop non - db fields as ormar will complain that it's unknown field
+        email = kwargs.pop("email", self.__fields__["email"].get_default())
+        url = kwargs.pop("url", self.__fields__["url"].get_default())
+        super().__init__(**kwargs)
+        self.email = email
+        self.url = url
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=200)
+    email: Optional[EmailStr]  # field optional - default to None
+    url: HttpUrl = "www.example.com"  # field with default
+
+
+@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)
+
+
+@pytest.mark.asyncio
+async def test_working_with_pydantic_fields():
+    async with database:
+        test = Test(name="Test", email="aka@go2.com")
+        assert test.name == "Test"
+        assert test.email == "aka@go2.com"
+        assert test.url == "www.example.com"
+
+        test.email = "sdta@ada.pt"
+        assert test.email == "sdta@ada.pt"
+
+        await test.save()
+        test_check = await Test.objects.get()
+
+        assert test_check.name == "Test"
+        assert test_check.email is None
+        assert test_check.url == "www.example.com"
+
+        # TODO add validate assignment to pydantic config
+        # test_check.email = 1