Merge branch 'develop'

Author: daireto

docs/api/active-record-mixin.md

@@ -1994,7 +1994,7 @@ def smart_query(
 
 ```python
 @classmethod
-def get_async_query(query: Select[tuple[Any, ...]] | None = None) -> AsyncQuery[Self]
+def get_async_query(query: Query | None = None) -> AsyncQuery[Self]
 ```
 
 > Returns an `AsyncQuery` instance with the provided

docs/api/async-query.md

@@ -192,7 +192,7 @@ async_query.query  # <sqlalchemy.sql.Select at 0x...>
 #### query
 
 ```python
-query: Select[tuple[Any, ...]]
+query: Query
 ```
 
 > The wrapped `sqlalchemy.sql.Select` instance.

docs/api/smart-query-mixin.md

@@ -971,15 +971,16 @@ def eager_expr(schema: EagerSchema) -> list[_AbstractLoad]
 ```python
 @classmethod
 def smart_query(
-    query: Select[tuple[Any, ...]],
+    cls,
+    query: Query,
     criteria: Sequence[_ColumnExpressionArgument[bool]] | None = None,
     filters: DjangoFilters | None = None,
     sort_columns: Sequence[_ColumnExpressionOrStrLabelArgument[Any]] | None = None,
     sort_attrs: Sequence[str] | None = None,
     group_columns: Sequence[_ColumnExpressionOrStrLabelArgument[Any]] | None = None,
     group_attrs: Sequence[str] | None = None,
     schema: EagerSchema | None = None,
-) -> Select[tuple[Any, ...]]:
+) -> Query:
 ```
 
 > Creates a query combining filtering, sorting, grouping and eager loading.
@@ -1021,7 +1022,7 @@ def smart_query(
 
 > **Returns**
 
-> - `Select[tuple[Any, ...]]`: SQLAlchemy query with filtering, sorting,
+> - `Query`: SQLAlchemy query with filtering, sorting,
 > grouping and eager loading, that is to say, a beautiful smart query.
 
 > **Examples**
@@ -1053,10 +1054,10 @@ def smart_query(
 ```python
 @classmethod
 def apply_search_filter(
-    query: Select[tuple[Any, ...]],
+    query: Query,
     search_term: str,
     columns: Sequence[str | InstrumentedAttribute[Any]] | None = None,
-) -> Select[tuple[Any, ...]]
+) -> Query
 ```
 
 > Applies a search filter to the query.
@@ -1072,7 +1073,7 @@ def apply_search_filter(
 
 > **Returns**
 
-> - `Select[tuple[Any, ...]]`: SQLAlchemy query with the search filter applied.
+> - `Query`: SQLAlchemy query with the search filter applied.
 
 > **Examples**
 

requirements.txt

@@ -1,5 +1,5 @@
-aiosqlite==0.20.0
-colorlog==6.9.0
+aiosqlite>=0.20.0
+colorlog>=6.9.0
 deprecated>=1.2.18
-sqlalchemy==2.0.36
+sqlalchemy>=2.0.0
 typing-extensions>=4.12.2

sqlactive/__init__.py

@@ -241,4 +241,4 @@ class BaseModel(ActiveRecordBaseModel):
 ]
 
 
-__version__ = '0.3.2'
+__version__ = '0.3.3'

sqlactive/active_record.py

@@ -21,6 +21,7 @@
     ColumnExpressionOrStrLabelArgument,
     DjangoFilters,
     EagerSchema,
+    Query,
     Self,
 )
 from .utils import classproperty
@@ -2169,9 +2170,7 @@ def smart_query(
         return cls.get_async_query(smart_query)
 
     @classmethod
-    def get_async_query(
-        cls, query: Select[tuple[Any, ...]] | None = None
-    ) -> AsyncQuery[Self]:
+    def get_async_query(cls, query: Query | None = None) -> AsyncQuery[Self]:
         """Returns an ``AsyncQuery`` instance with
         the provided ``sqlalchemy.sql.Select`` instance.
 
@@ -2180,7 +2179,7 @@ def get_async_query(
 
         Parameters
         ----------
-        query : Select[tuple[Any, ...]] | None, optional
+        query : Query | None, optional
             SQLAlchemy query, by default None.
 
         Returns

sqlactive/async_query.py

@@ -6,7 +6,6 @@
 from sqlalchemy.engine import Result, Row, ScalarResult
 from sqlalchemy.orm import joinedload, selectinload, subqueryload
 from sqlalchemy.orm.attributes import InstrumentedAttribute
-from sqlalchemy.sql import Select
 from sqlalchemy.sql._typing import _ColumnsClauseArgument
 from sqlalchemy.sql.base import ExecutableOption
 from sqlalchemy.sql.elements import ColumnElement
@@ -19,6 +18,7 @@
     ColumnExpressionOrStrLabelArgument,
     EagerLoadPath,
     EagerSchema,
+    Query,
     Self,
     T,
 )
@@ -88,10 +88,10 @@ class AsyncQuery(SessionMixin, SmartQueryMixin, Generic[T]):
 
     __abstract__ = True
 
-    query: Select[tuple[Any, ...]]
+    query: Query
     """The wrapped ``sqlalchemy.sql.Select`` instance."""
 
-    def __init__(self, query: Select[tuple[Any, ...]]) -> None:
+    def __init__(self, query: Query) -> None:
         """Builds an async wrapper for SQLAlchemy ``Query``.
 
         .. warning::
@@ -100,7 +100,7 @@ def __init__(self, query: Select[tuple[Any, ...]]) -> None:
 
         Parameters
         ----------
-        query : Select[tuple[Any, ...]]
+        query : Query
             The ``sqlalchemy.sql.Select`` instance.
         """
         self.query = query

sqlactive/exceptions.py

@@ -35,22 +35,6 @@ def __init__(self, class_name: str, note: str = '') -> None:
         )
 
 
-class InvalidJoinMethodError(SQLActiveError, ValueError):
-    """Invalid join method."""
-
-    def __init__(self, join_method: str, note: str = '') -> None:
-        """Invalid join method.
-
-        Parameters
-        ----------
-        join_method : str
-            Join method.
-        note : str, optional
-            Additional note, by default ''.
-        """
-        super().__init__(f'no such join method: {join_method!r}', note)
-
-
 class ModelAttributeError(SQLActiveError, AttributeError):
     """Attribute not found in model."""