sqlakit 0.7.0__tar.gz → 0.7.2__tar.gz

{sqlakit-0.7.0 → sqlakit-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlakit
-Version: 0.7.0
+Version: 0.7.2
 Summary: A toolkit for SQLAlchemy applications.
 Keywords: sqlalchemy,database,orm,sql,asyncio
 Author: Anton Ruhlov

{sqlakit-0.7.0 → sqlakit-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.7.0"
+version = "0.7.2"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"

{sqlakit-0.7.0 → sqlakit-0.7.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit"
-version = "0.7.0"
+version = "0.7.2"
 description = "A toolkit for SQLAlchemy applications."
 readme = "README.md"
 license = "MIT"

{sqlakit-0.7.0 → sqlakit-0.7.2}/sqlakit/__init__.py

@@ -18,6 +18,7 @@ from .exceptions import (
     AsyncFilterError,
     BulkQueryError,
     ConflictingDatabaseUrlError,
+    ConflictingJoinError,
     DatabaseAlreadyConfiguredError,
     DatabaseNotConfiguredError,
     DefaultAliasError,
@@ -69,6 +70,7 @@ __all__ = [
     "AsyncFilterError",
     "BulkQueryError",
     "ConflictingDatabaseUrlError",
+    "ConflictingJoinError",
     "CursorPage",
     "Database",
     "DatabaseAlreadyConfiguredError",

{sqlakit-0.7.0 → sqlakit-0.7.2}/sqlakit/_query.py

@@ -37,6 +37,7 @@ from typing_extensions import TypeVar
 from ._model import resolve_alias, soft_delete_column
 from .exceptions import (
     BulkQueryError,
+    ConflictingJoinError,
     InstanceNotFoundError,
     InvalidCursorError,
     InvalidNullsError,
@@ -465,7 +466,7 @@ class BaseQuery(Generic[ModelT]):
         )
         return query
 
-    def from_sql(self, template: str, **context: Any) -> Self:  # noqa: ANN401
+    def from_sql(self, template: str, /, **context: Any) -> Self:  # noqa: ANN401
         """Take the rows of a SQL template, mapped onto the model.
 
         ```python
@@ -1015,11 +1016,13 @@ def ordered(
         else {_field_named(one, fields) for one in ignore_case}
     )
     clauses = []
+    joined: dict[str, Any] = {}
     for criterion in named:
         clause, join = _ordering_for(criterion, fields, ignore_case=folded)
         clauses.append(_with_nulls(clause, nulls))
         if join is not None:
             target, onclause, outer = join
+            _reject_conflicting_join(joined, target, onclause)
             if not _is_joined(select, target):
                 select = select.join(target, onclause, isouter=outer)
     return select.order_by(*clauses)
@@ -1176,6 +1179,33 @@ def _join_for(field: Any) -> tuple[Any, None, bool] | None:  # noqa: ANN401
     return None if table is None else (table, None, True)
 
 
+def _reject_conflicting_join(
+    joined: dict[str, Any],
+    target: Any,  # noqa: ANN401
+    onclause: Any,  # noqa: ANN401
+) -> None:
+    """Refuse a second join of one table on another condition.
+
+    A statement joins a table once, so the second condition would be dropped
+    and the field would order by the first one's rows.
+
+    Raises:
+        ConflictingJoinError: if the table is already joined on something else.
+
+    """
+    identity = _join_identity(target)
+    if identity is None:
+        return
+    if identity not in joined:
+        joined[identity] = onclause
+        return
+    first = joined[identity]
+    if first is None or onclause is None:
+        return
+    if not first.compare(onclause):
+        raise ConflictingJoinError(identity)
+
+
 def _is_joined(select: sa.Select[Any], target: Any) -> bool:  # noqa: ANN401
     """Whether this statement already reaches what a field needs."""
     wanted = _join_identity(target)

{sqlakit-0.7.0 → sqlakit-0.7.2}/sqlakit/asyncio/sql.py

@@ -46,7 +46,7 @@ class SQL:
     def __repr__(self) -> str:
         return f"{type(self).__name__}({self.db!r})"
 
-    def __call__(self, template: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def __call__(self, template: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of a template. Short for `from_file`.
 
         ```python
@@ -55,7 +55,7 @@ class SQL:
         """
         return self.from_file(template, **context)
 
-    def from_file(self, template: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def from_file(self, template: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of a template kept under the database's ``templates=``.
 
         ```python
@@ -66,7 +66,7 @@ class SQL:
         """
         return SQLQuery(self.db, template, context)
 
-    def from_string(self, source: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def from_string(self, source: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of SQL written out here rather than kept in a file.
 
         ```python

{sqlakit-0.7.0 → sqlakit-0.7.2}/sqlakit/exceptions.py

@@ -9,6 +9,7 @@ __all__ = [
     "AsyncFilterError",
     "BulkQueryError",
     "ConflictingDatabaseUrlError",
+    "ConflictingJoinError",
     "DatabaseAlreadyConfiguredError",
     "DatabaseNotConfiguredError",
     "DefaultAliasError",
@@ -426,6 +427,18 @@ class InvalidOrderFieldError(SQLAKitError, TypeError):
         )
 
 
+class ConflictingJoinError(SQLAKitError, TypeError):
+    """Raised when two ordering fields join one table on different conditions."""
+
+    def __init__(self, table: str) -> None:
+        self.table = table
+        super().__init__(
+            f"Two ordering fields join `{table}` on different conditions, and a "
+            f"statement joins it once. Alias it with `sqlalchemy.orm.aliased` so "
+            f"that each field joins an alias of its own."
+        )
+
+
 class InvalidNullsError(SQLAKitError, ValueError):
     """Raised when ``order_by`` is told to put the nulls somewhere else.
 

{sqlakit-0.7.0 → sqlakit-0.7.2}/sqlakit/sql.py

@@ -45,7 +45,7 @@ class SQL:
     def __repr__(self) -> str:
         return f"{type(self).__name__}({self.db!r})"
 
-    def __call__(self, template: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def __call__(self, template: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of a template. Short for `from_file`.
 
         ```python
@@ -54,7 +54,7 @@ class SQL:
         """
         return self.from_file(template, **context)
 
-    def from_file(self, template: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def from_file(self, template: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of a template kept under the database's ``templates=``.
 
         ```python
@@ -65,7 +65,7 @@ class SQL:
         """
         return SQLQuery(self.db, template, context)
 
-    def from_string(self, source: str, **context: Any) -> SQLQuery:  # noqa: ANN401
+    def from_string(self, source: str, /, **context: Any) -> SQLQuery:  # noqa: ANN401
         """Read the rows of SQL written out here rather than kept in a file.
 
         ```python