fix complex parameter filter with between

.gitignore

@@ -159,9 +159,9 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 # Macos
 .DS_Store
 
-.ruff_cache
+.ruff_cache

fastcrud/crud/fast_crud.py

@@ -318,7 +318,7 @@ def _parse_filters(
                         for or_key, or_value in value.items()
                         if (
                             sqlalchemy_filter := self._get_sqlalchemy_filter(
-                                or_key, value
+                                or_key, or_value
                             )
                         )
                         is not None
@@ -327,7 +327,11 @@ def _parse_filters(
                 else:
                     sqlalchemy_filter = self._get_sqlalchemy_filter(op, value)
                     if sqlalchemy_filter:
-                        filters.append(sqlalchemy_filter(column)(value))
+                        filters.append(
+                            sqlalchemy_filter(column)(value)
+                            if op != "between"
+                            else sqlalchemy_filter(column)(*value)
+                        )
             else:
                 column = getattr(model, key, None)
                 if column is not None:

fastcrud/endpoint/crud_router.py

@@ -430,10 +430,10 @@ async def add_routes_to_router(self, ...):
         session=session,
         model=model,
         crud=crud,
-        create_schema=create_schema,
-        update_schema=update_schema,
+        create_schema=create_schema,  # type: ignore
+        update_schema=update_schema,  # type: ignore
         include_in_schema=include_in_schema,
-        delete_schema=delete_schema,
+        delete_schema=delete_schema,  # type: ignore
         path=path,
         tags=tags,
         is_deleted_column=is_deleted_column,

tests/sqlalchemy/core/test_parse_filters.py

@@ -48,6 +48,16 @@ async def test_parse_filters_not_contained_in(test_model):
     )
 
 
+@pytest.mark.asyncio
+async def test_parse_filters_between_condition(test_model):
+    fast_crud = FastCRUD(test_model)
+    filters = fast_crud._parse_filters(category_id__between=[1, 5])
+    assert len(filters) == 1
+    assert (
+        str(filters[0]) == "test.category_id BETWEEN :category_id_1 AND :category_id_2"
+    )
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("operator", ("in", "not_in", "between"))
 async def test_parse_filters_raises_exception(test_model, operator: str):

tests/sqlmodel/core/test_parse_filters.py

@@ -48,6 +48,16 @@ async def test_parse_filters_not_contained_in(test_model):
     )
 
 
+@pytest.mark.asyncio
+async def test_parse_filters_between_condition(test_model):
+    fast_crud = FastCRUD(test_model)
+    filters = fast_crud._parse_filters(category_id__between=[1, 5])
+    assert len(filters) == 1
+    assert (
+        str(filters[0]) == "test.category_id BETWEEN :category_id_1 AND :category_id_2"
+    )
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("operator", ("in", "not_in", "between"))
 async def test_parse_filters_raises_exception(test_model, operator: str):