🪛 Refactor test folder and added filter by object

Author: tarsil

saffier/db/queryset.py

@@ -89,13 +89,6 @@ def _build_tables_select_from_relationship(self):
 
         return tables, select_from
 
-    def _build_select_for_update(self):
-        # breakpoint()
-        expression = expression.with_for_update(
-            nowait=self._select_for_update_nowait, of=self.model_class
-        )
-        return expression
-
     def _build_select(self):
         """
         Builds the query select based on the given parameters and filters.
@@ -124,10 +117,6 @@ def _build_select(self):
         if self.distinct_on:
             expression = self._build_select_distinct(self.distinct_on, expression=expression)
 
-        # breakpoint()
-        if self._select_for_update:
-            expression = self._build_select_for_update(expression=expression)
-
         return expression
 
     def _filter_query(self, exclude: bool = False, **kwargs):
@@ -243,8 +232,6 @@ def _clone(self) -> "QuerySet[SaffierModel]":
         queryset._order_by = copy.copy(self._order_by)
         queryset._group_by = copy.copy(self._group_by)
         queryset.distinct_on = copy.copy(self.distinct_on)
-        queryset._select_for_update = self._select_for_update
-        queryset._select_for_update_nowait = self._select_for_update_nowait
         return queryset
 
 
@@ -265,8 +252,6 @@ def __init__(
         order_by=None,
         group_by=None,
         distinct_on=None,
-        select_for_update=False,
-        select_for_update_nowait=False,
     ):
         super().__init__(model_class=model_class)
         self.model_class = model_class
@@ -277,8 +262,6 @@ def __init__(
         self._order_by = [] if order_by is None else order_by
         self._group_by = [] if group_by is None else group_by
         self.distinct_on = [] if distinct_on is None else distinct_on
-        self._select_for_update = select_for_update
-        self._select_for_update_nowait = select_for_update_nowait
 
     def __get__(self, instance, owner):
         return self.__class__(model_class=owner)
@@ -400,15 +383,6 @@ def select_related(self, related):
         queryset._select_related = related
         return queryset
 
-    def select_for_update(self, nowait: bool = False):
-        """
-        Locks a record and allows to update
-        """
-        queryset = self._clone()
-        queryset._select_for_update = True
-        queryset._select_for_update_nowait = nowait
-        return queryset
-
     async def exists(self) -> bool:
         """
         Returns a boolean indicating if a record exists or not.

tests/models/test_model_class.py

@@ -0,0 +1,115 @@
+import pytest
+from tests.settings import DATABASE_URL
+
+import saffier
+from saffier.db import fields
+from saffier.db.connection import Database
+from saffier.exceptions import DoesNotFound, MultipleObjectsReturned
+
+database = Database(url=DATABASE_URL)
+models = saffier.Registry(database=database)
+
+pytestmark = pytest.mark.anyio
+
+
+class User(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
+    name = saffier.CharField(max_length=100)
+    language = saffier.CharField(max_length=200, null=True)
+
+    class Meta:
+        registry = models
+
+
+class Product(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
+    name = saffier.CharField(max_length=100)
+    rating = saffier.IntegerField(minimum=1, maximum=5)
+    in_stock = saffier.BooleanField(default=False)
+
+    class Meta:
+        registry = models
+        name = "products"
+
+
+@pytest.fixture(autouse=True, scope="function")
+async def create_test_database():
+    await models.create_all()
+    yield
+    await models.drop_all()
+
+
+@pytest.fixture(autouse=True)
+async def rollback_connections():
+    with database.force_rollback():
+        async with database:
+            yield
+
+
+def test_model_class():
+    assert list(User.fields.keys()) == ["id", "name", "language"]
+    assert isinstance(User.fields["id"], saffier.IntegerField)
+    assert User.fields["id"].primary_key is True
+    assert isinstance(User.fields["name"], saffier.CharField)
+    assert User.fields["name"].validator.max_length == 100
+
+    with pytest.raises(ValueError):
+        User(invalid="123")
+
+    assert User(id=1) != Product(id=1)
+    assert User(id=1) != User(id=2)
+    assert User(id=1) == User(id=1)
+
+    assert str(User(id=1)) == "User(id=1)"
+    assert repr(User(id=1)) == "<User: User(id=1)>"
+
+    assert isinstance(User.query.schema.fields["id"], fields.Integer)
+    assert isinstance(User.query.schema.fields["name"], fields.String)
+
+
+def test_model_pk():
+    user = User(pk=1)
+    assert user.pk == 1
+    assert user.id == 1
+    assert User.query.pkname == "id"
+
+
+async def test_model_crud():
+    users = await User.query.all()
+    assert users == []
+
+    user = await User.query.create(name="Test")
+    users = await User.query.all()
+    assert user.name == "Test"
+    assert user.pk is not None
+    assert users == [user]
+
+    lookup = await User.query.get()
+    assert lookup == user
+
+    await user.update(name="Jane")
+    users = await User.query.all()
+    assert user.name == "Jane"
+    assert user.pk is not None
+    assert users == [user]
+
+    await user.delete()
+    users = await User.query.all()
+    assert users == []
+
+
+async def test_model_get():
+    with pytest.raises(DoesNotFound):
+        await User.query.get()
+
+    user = await User.query.create(name="Test")
+    lookup = await User.query.get()
+    assert lookup == user
+
+    user = await User.query.create(name="Jane")
+    with pytest.raises(MultipleObjectsReturned):
+        await User.query.get()
+
+    same_user = await User.query.get(pk=user.id)
+    assert same_user.id == user.id
+    assert same_user.pk == user.pk

tests/models/test_model.py renamed to tests/models/test_model_count.py

@@ -2,30 +2,21 @@
 from tests.settings import DATABASE_URL
 
 import saffier
-from saffier import Registry
 from saffier.db.connection import Database
 
 database = Database(url=DATABASE_URL)
-models = Registry(database=database)
-nother = Registry(database=database)
+models = saffier.Registry(database=database)
 
 pytestmark = pytest.mark.anyio
 
 
-class BaseUser(saffier.Model):
+class User(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
     name = saffier.CharField(max_length=100)
     language = saffier.CharField(max_length=200, null=True)
 
     class Meta:
         registry = models
-        abstract = True
-
-
-class Profile(BaseUser):
-    age = saffier.IntegerField()
-
-    def __str__(self):
-        return f"Age: {self.age}, Name:{self.name}"
 
 
 @pytest.fixture(autouse=True, scope="function")
@@ -42,9 +33,10 @@ async def rollback_connections():
             yield
 
 
-async def xtest_meta_inheritance_registry():
-    profile = await Profile.query.create(name="test", language="EN", age=23)
-
-    results = await Profile.query.filter()
+async def test_model_count():
+    await User.query.create(name="Test")
+    await User.query.create(name="Jane")
+    await User.query.create(name="Lucy")
 
-    len(results)
+    assert await User.query.count() == 3
+    assert await User.query.filter(name__icontains="T").count() == 1

tests/models/test_model_distinct.py

@@ -0,0 +1,81 @@
+import pytest
+from tests.settings import DATABASE_URL
+
+import saffier
+from saffier.db.connection import Database
+
+database = Database(url=DATABASE_URL)
+models = saffier.Registry(database=database)
+
+pytestmark = pytest.mark.anyio
+
+
+class Product(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
+    name = saffier.CharField(max_length=100)
+    rating = saffier.IntegerField(minimum=1, maximum=5)
+    in_stock = saffier.BooleanField(default=False)
+
+    class Meta:
+        registry = models
+        name = "products"
+
+
+@pytest.fixture(autouse=True, scope="function")
+async def create_test_database():
+    await models.create_all()
+    yield
+    await models.drop_all()
+
+
+@pytest.fixture(autouse=True)
+async def rollback_connections():
+    with database.force_rollback():
+        async with database:
+            yield
+
+
+@pytest.mark.skipif(database.url.dialect == "mysql", reason="Not supported on MySQL")
+@pytest.mark.skipif(database.url.dialect == "sqlite", reason="Not supported on SQLite")
+async def test_distinct():
+    await Product.query.create(name="test", rating=5, in_stock=True)
+    await Product.query.create(name="test", rating=4, in_stock=True)
+    await Product.query.create(name="test", rating=2, in_stock=True)
+
+    products = await Product.query.distinct("name").all()
+    assert len(products) == 1
+
+    products = await Product.query.distinct("rating").all()
+    assert len(products) == 3
+
+    products = await Product.query.distinct("name", "in_stock").all()
+    assert len(products) == 1
+
+    products = await Product.query.distinct("in_stock").all()
+    assert len(products) == 1
+
+    products = await Product.query.distinct("rating", "in_stock").all()
+    assert len(products) == 3
+
+
+@pytest.mark.skipif(database.url.dialect == "mysql", reason="Not supported on MySQL")
+@pytest.mark.skipif(database.url.dialect == "sqlite", reason="Not supported on SQLite")
+async def test_distinct_two_without_all():
+    await Product.query.create(name="test", rating=5, in_stock=True)
+    await Product.query.create(name="test", rating=4, in_stock=True)
+    await Product.query.create(name="test", rating=2, in_stock=True)
+
+    products = await Product.query.distinct("name")
+    assert len(products) == 1
+
+    products = await Product.query.distinct("rating")
+    assert len(products) == 3
+
+    products = await Product.query.distinct("name", "in_stock")
+    assert len(products) == 1
+
+    products = await Product.query.distinct("in_stock")
+    assert len(products) == 1
+
+    products = await Product.query.distinct("rating", "in_stock")
+    assert len(products) == 3

tests/models/test_model_exists.py

@@ -0,0 +1,39 @@
+import pytest
+from tests.settings import DATABASE_URL
+
+import saffier
+from saffier.db.connection import Database
+
+database = Database(url=DATABASE_URL)
+models = saffier.Registry(database=database)
+
+pytestmark = pytest.mark.anyio
+
+
+class User(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
+    name = saffier.CharField(max_length=100)
+    language = saffier.CharField(max_length=200, null=True)
+
+    class Meta:
+        registry = models
+
+
+@pytest.fixture(autouse=True, scope="function")
+async def create_test_database():
+    await models.create_all()
+    yield
+    await models.drop_all()
+
+
+@pytest.fixture(autouse=True)
+async def rollback_connections():
+    with database.force_rollback():
+        async with database:
+            yield
+
+
+async def test_model_exists():
+    await User.query.create(name="Test")
+    assert await User.query.filter(name="Test").exists() is True
+    assert await User.query.filter(name="Jane").exists() is False

tests/models/test_model_first.py

@@ -0,0 +1,43 @@
+import pytest
+from tests.settings import DATABASE_URL
+
+import saffier
+from saffier.db.connection import Database
+
+database = Database(url=DATABASE_URL)
+models = saffier.Registry(database=database)
+
+pytestmark = pytest.mark.anyio
+
+
+class User(saffier.Model):
+    id = saffier.IntegerField(primary_key=True)
+    name = saffier.CharField(max_length=100)
+    language = saffier.CharField(max_length=200, null=True)
+
+    class Meta:
+        registry = models
+
+
+@pytest.fixture(autouse=True, scope="function")
+async def create_test_database():
+    await models.create_all()
+    yield
+    await models.drop_all()
+
+
+@pytest.fixture(autouse=True)
+async def rollback_connections():
+    with database.force_rollback():
+        async with database:
+            yield
+
+
+async def test_model_first():
+    Test = await User.query.create(name="Test")
+    jane = await User.query.create(name="Jane")
+
+    assert await User.query.first() == Test
+    assert await User.query.first(name="Jane") == jane
+    assert await User.query.filter(name="Jane").first() == jane
+    assert await User.query.filter(name="Lucy").first() is None