Update tests

Author: wu-clan

tests/test_delete.py

@@ -33,8 +33,7 @@ async def test_delete_model_by_id_not_found(db: AsyncSession, crud_ins: CRUDPlus
 async def test_delete_model_with_flush(db: AsyncSession, sample_ins: list[Ins], crud_ins: CRUDPlus[Ins]):
     item = sample_ins[1]
 
-    async with db.begin():
-        count = await crud_ins.delete_model(db, item.id, flush=True)
+    count = await crud_ins.delete_model(db, item.id, flush=True)
 
     assert count == 1
 
@@ -211,15 +210,14 @@ async def test_logical_delete_with_filters(db: AsyncSession, sample_ins: list[In
 async def test_logical_delete_with_flush(db: AsyncSession, sample_ins: list[Ins], crud_ins: CRUDPlus[Ins]):
     item = sample_ins[2]
 
-    async with db.begin():
-        count = await crud_ins.delete_model_by_column(
-            db,
-            logical_deletion=True,
-            deleted_flag_column='is_deleted',
-            allow_multiple=False,
-            flush=True,
-            id=item.id,
-        )
+    count = await crud_ins.delete_model_by_column(
+        db,
+        logical_deletion=True,
+        deleted_flag_column='is_deleted',
+        allow_multiple=False,
+        flush=True,
+        id=item.id,
+    )
 
     assert count == 1
 

tests/test_filters.py

@@ -205,6 +205,13 @@ async def test_filter_mul(db: AsyncSession, sample_ins: list[Ins], crud_ins: CRU
     assert len(results) >= 0
 
 
+@pytest.mark.asyncio
+async def test_filter_mul_with_condition(db: AsyncSession, sample_ins: list[Ins], crud_ins: CRUDPlus[Ins]):
+    results = await crud_ins.select_models(db, id__mul={'value': 2, 'condition': {'gt': 0}})
+
+    assert len(results) >= 0
+
+
 @pytest.mark.asyncio
 async def test_filter_rmul(db: AsyncSession, sample_ins: list[Ins], crud_ins: CRUDPlus[Ins]):
     results = await crud_ins.select_models(db, id__rmul=3)

tests/test_select.py

@@ -2,10 +2,13 @@
 # -*- coding: utf-8 -*-
 import pytest
 
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from sqlalchemy_crud_plus import CRUDPlus
+from sqlalchemy_crud_plus.types import JoinConfig
 from tests.models.basic import Ins
+from tests.models.no_relationship import NoRelProfile, NoRelUser
 
 
 @pytest.mark.asyncio
@@ -255,3 +258,81 @@ async def test_exists_with_kwargs(db: AsyncSession, sample_ins: list[Ins], crud_
     exists = await crud_ins.exists(db, is_deleted=False)
 
     assert isinstance(exists, bool)
+
+
+@pytest.mark.asyncio
+async def test_select_model_with_fill_result(db: AsyncSession, no_rel_sample_data: dict):
+    crud_user = CRUDPlus(NoRelUser)
+    user = no_rel_sample_data['users'][0]
+
+    result = await crud_user.select_model(
+        db,
+        user.id,
+        join_conditions=[
+            JoinConfig(
+                model=NoRelProfile,
+                join_on=NoRelUser.id == NoRelProfile.user_id,
+                join_type='left',
+                fill_result=True,
+            )
+        ],
+    )
+
+    assert result is not None
+    assert isinstance(result, (tuple, Row))
+    assert len(result) == 2
+    assert isinstance(result[0], NoRelUser)
+    if result[1]:
+        assert isinstance(result[1], NoRelProfile)
+
+
+@pytest.mark.asyncio
+async def test_select_model_by_column_with_fill_result(db: AsyncSession, no_rel_sample_data: dict):
+    crud_user = CRUDPlus(NoRelUser)
+    user = no_rel_sample_data['users'][0]
+
+    result = await crud_user.select_model_by_column(
+        db,
+        name=user.name,
+        join_conditions=[
+            JoinConfig(
+                model=NoRelProfile,
+                join_on=NoRelUser.id == NoRelProfile.user_id,
+                join_type='left',
+                fill_result=True,
+            )
+        ],
+    )
+
+    assert result is not None
+    assert isinstance(result, (tuple, Row))
+    assert len(result) == 2
+    assert isinstance(result[0], NoRelUser)
+    if result[1]:
+        assert isinstance(result[1], NoRelProfile)
+
+
+@pytest.mark.asyncio
+async def test_select_models_order_with_fill_result(db: AsyncSession, no_rel_sample_data: dict):
+    crud_user = CRUDPlus(NoRelUser)
+
+    results = await crud_user.select_models_order(
+        db,
+        'name',
+        join_conditions=[
+            JoinConfig(
+                model=NoRelProfile,
+                join_on=NoRelUser.id == NoRelProfile.user_id,
+                join_type='left',
+                fill_result=True,
+            )
+        ],
+    )
+
+    assert len(results) >= 1
+    for result in results:
+        assert isinstance(result, (tuple, Row))
+        assert len(result) == 2
+        assert isinstance(result[0], NoRelUser)
+        if result[1]:
+            assert isinstance(result[1], NoRelProfile)

tests/test_update.py

@@ -35,8 +35,7 @@ async def test_update_model_with_flush(db: AsyncSession, sample_ins: list[Ins],
     item = sample_ins[0]
     update_data = UpdateIns(name='flush_update')
 
-    async with db.begin():
-        result = await crud_ins.update_model(db, item.id, update_data, flush=True)
+    result = await crud_ins.update_model(db, item.id, update_data, flush=True)
 
     assert result == 1
 
@@ -114,8 +113,7 @@ async def test_update_model_by_column_with_flush(db: AsyncSession, sample_ins: l
     item = sample_ins[0]
     update_data = UpdateIns(name='flush_column_update')
 
-    async with db.begin():
-        result = await crud_ins.update_model_by_column(db, update_data, flush=True, id=item.id)
+    result = await crud_ins.update_model_by_column(db, update_data, flush=True, id=item.id)
 
     assert result == 1
 
@@ -283,10 +281,9 @@ async def test_bulk_update_models_pk_mode_false_with_flush(db: AsyncSession, cru
 
     update_data = [{'name': 'updated_flush_1'}, {'name': 'updated_flush_2'}]
 
-    async with db.begin():
-        result = await crud_ins.bulk_update_models(
-            db, update_data, pk_mode=False, flush=True, name__like='bulk_update_flush_%'
-        )
+    result = await crud_ins.bulk_update_models(
+        db, update_data, pk_mode=False, flush=True, name__like='bulk_update_flush_%'
+    )
 
     assert result == 2
 

tests/test_utils.py

@@ -102,14 +102,38 @@ def test_valid_columns_name(self):
         assert column.name == 'name'
 
     def test_invalid_column(self):
-        with pytest.raises(ModelColumnError):
+        with pytest.raises(ModelColumnError) as exc_info:
             get_column(Ins, 'nonexistent_column')
+        assert str(exc_info.value)
 
     def test_aliased_model(self):
         aliased_ins = aliased(Ins)
         column = get_column(aliased_ins, 'name')
         assert column is not None
 
+    def test_invalid_column_property(self):
+        from sqlalchemy import ForeignKey
+        from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
+
+        class Base(DeclarativeBase):
+            pass
+
+        class TestModel(Base):
+            __tablename__ = 'test_model'
+            id: Mapped[int] = mapped_column(primary_key=True)
+            name: Mapped[str] = mapped_column()
+
+        class RelatedModel(Base):
+            __tablename__ = 'related_model'
+            id: Mapped[int] = mapped_column(primary_key=True)
+            test_id: Mapped[int] = mapped_column(ForeignKey('test_model.id'))
+
+        TestModel.related = relationship(RelatedModel)
+
+        with pytest.raises(ModelColumnError) as exc_info:
+            get_column(TestModel, 'related')
+        assert str(exc_info.value)
+
 
 class TestParseFilters:
     def test_basic_filters(self):