TypeDAL 5.0.2__tar.gz → 5.0.4__tar.gz

{typedal-5.0.2 → typedal-5.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 5.0.2
+Version: 5.0.4
 Summary: Typing support for PyDAL
 Keywords: 
 Author: Robin van der Noord

{typedal-5.0.2 → typedal-5.0.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "uv_build"
 name = "TypeDAL"
 description = "Typing support for PyDAL"
 readme = "README.md"
-version = "5.0.2"
+version = "5.0.4"
 requires-python = ">=3.12"
 license-expression = "MIT"
 keywords = []

{typedal-5.0.2 → typedal-5.0.4}/pyproject.toml.orig

@@ -6,7 +6,7 @@ build-backend = "uv_build"
 name = "TypeDAL"
 description = 'Typing support for PyDAL'
 readme = "README.md"
-version = "5.0.2"
+version = "5.0.4"
 requires-python = ">=3.12"
 license-expression = "MIT"
 keywords = []

{typedal-5.0.2 → typedal-5.0.4}/src/typedal/cli.py

@@ -226,7 +226,7 @@ def setup(
     data.pop("connection", None)
 
     # ignore any None:
-    old_contents["tool"]["typedal"] = {k: v for k, v in data.items() if v is not None}  # type: ignore
+    old_contents["tool"]["typedal"] = {k: v for k, v in data.items() if v is not None}
 
     with toml_path.open("w") as f:
         tomlkit.dump(old_contents, f)

{typedal-5.0.2 → typedal-5.0.4}/src/typedal/fields.py

@@ -198,7 +198,7 @@ class TypedField[T_Value](Expression):  # pragma: no cover
         self._field = t.cast(Field, field)
 
     def unbind(self) -> None:
-        """Remove references to the pydal objects created during ``bind``."""
+        """Remove references to the pydal objects created during `bind`."""
         if getattr(self, "requires", None):
             if isinstance(self.requires, list):
                 self.requires.clear()

{typedal-5.0.2 → typedal-5.0.4}/src/typedal/tables.py

@@ -126,7 +126,7 @@ class TableMeta(type):
         self._permissions = merge_permissions(permissions)
 
     def unbind(self) -> None:
-        """Remove the database bindings created by ``db.define``."""
+        """Remove the database bindings created by `db.define`."""
         for value in self.__dict__.values():
             if isinstance(value, TypedField):
                 value.unbind()

{typedal-5.0.2 → typedal-5.0.4}/src/typedal/types.py

@@ -104,9 +104,9 @@ class TableProtocol(t.Protocol):  # pragma: no cover
         Type checkers cannot infer the owning table from a relationship's
         class-body assignment, and forward references can also obscure the
         related table. PyDAL exposes table fields dynamically, so arbitrary
-        field access must remain permissive here. Because ``__getattr__``
-        returns ``Any``, type checkers do not validate field names in
-        relationship callbacks; for example, ``self.fakefield`` is accepted
+        field access must remain permissive here. Because `__getattr__`
+        returns `Any`, type checkers do not validate field names in
+        relationship callbacks; for example, `self.fakefield` is accepted
         even when no such field exists.
         """
 
@@ -203,6 +203,18 @@ class Field(_Field):
 
     _rname: str
 
+    def __eq__(self, other: t.Any) -> Query:  # type: ignore[override]
+        """Comparing fields produces a PyDAL query."""
+        return t.cast(Query, super().__eq__(other))
+
+    def __ne__(self, other: t.Any) -> Query:  # type: ignore[override]
+        """Comparing fields produces a PyDAL query."""
+        return t.cast(Query, super().__ne__(other))
+
+    def __hash__(self) -> int:
+        """Keep fields hashable after overriding equality."""
+        return super().__hash__()
+
 
 class Rows(_Rows):
     """Pydal Rows object. Make mypy happy."""
@@ -418,9 +430,12 @@ type P_Table = TableProtocol
 
 type QueryLike = Query | _Query | bool
 
-type Condition = t.Optional[t.Callable[[P_Table, P_Table], QueryLike]]
+type Condition = t.Callable[[type["TypedTable"], type["TypedTable"]], QueryLike] | None
 
-type OnQuery = t.Optional[t.Callable[[P_Table, P_Table], list[Expression | _Expression]]]
+# An `on` callback can include an alias binding for later join expressions.
+# QueryBuilder ignores table entries when it constructs the actual joins.
+type OnQueryItem = Expression | _Expression | t.Type["TypedTable"]
+type OnQuery = t.Callable[[P_Table, P_Table], t.Sequence[OnQueryItem]] | None
 
 type CacheModel = t.Callable[[str, CacheFn, int], Rows]
 type CacheTuple = tuple[CacheModel, int]