TypeDAL 3.11.1__tar.gz → 3.12.1__tar.gz

{typedal-3.11.1 → typedal-3.12.1}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.12.1 (2025-04-25)
+
+### Fix
+
+* Support latest pydal version ([`5af1d2b`](https://github.com/trialandsuccess/TypeDAL/commit/5af1d2bbb8cd4188cfab840191816fc0de87cc4a))
+
+## v3.12.0 (2025-04-25)
+
+### Feature
+
+* Support adding a `unique_alias` which improves working with multiple joins. ([`8b2112c`](https://github.com/trialandsuccess/TypeDAL/commit/8b2112cf9c97a00a9610e1af6e80e05fcc296aad))
+
 ## v3.11.1 (2025-04-25)
 
 ### Fix

{typedal-3.11.1 → typedal-3.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 3.11.1
+Version: 3.12.1
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -15,12 +15,12 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
-Requires-Dist: configurable-json
-Requires-Dist: configuraptor>=1.26.2
-Requires-Dist: dill
+Requires-Dist: configurable-json<2
+Requires-Dist: configuraptor<2,>=1.26.2
+Requires-Dist: dill<1
 Requires-Dist: legacy-cgi; python_version >= '3.13'
-Requires-Dist: pydal<20250215.1
-Requires-Dist: python-slugify
+Requires-Dist: pydal<=20250228.1
+Requires-Dist: python-slugify<2
 Provides-Extra: all
 Requires-Dist: edwh-migrate[full]>=0.8.0; extra == 'all'
 Requires-Dist: py4web; extra == 'all'

{typedal-3.11.1 → typedal-3.12.1}/docs/4_relationships.md

@@ -92,16 +92,22 @@ Adding the `Relationship["Sidekick"]` hint is optional, but recommended to impro
 Setting up a relationship that uses a junction/pivot table is slightly harder.
 
 ```python
+
+# with `unique_alias()` which is better if you have multiple joins:
+
 @db.define()
 class Post(TypedTable):
     title: str
     author: Author
 
     tags = relationship(list["Tag"], on=lambda post, tag: [
-        Tagged.on(Tagged.post == post.id),
-        tag.on(tag.id == Tagged.tag),
+        # post and tag already have a unique alias, create one for tagged here:
+        tagged := Tagged.unique_alias(),
+        tagged.on(tagged.post == post.id),
+        tag.on(tag.id == tagged.tag),
     ])
 
+# without unique alias:
 
 @db.define()
 class Tag(TypedTable):

{typedal-3.11.1 → typedal-3.12.1}/pyproject.toml

@@ -24,11 +24,11 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
-    "pydal<20250215.1", # core
-    "dill", # caching
-    "configuraptor >= 1.26.2", # config
-    "Configurable-JSON", # json dumping
-    "python-slugify",
+    "pydal <= 20250228.1", # core
+    "dill < 1", # caching
+    "configuraptor >= 1.26.2, < 2", # config
+    "Configurable-JSON < 2", # json dumping
+    "python-slugify < 2",
     "legacy-cgi; python_version >= '3.13'"
 ]
 

{typedal-3.11.1 → typedal-3.12.1}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "3.11.1"
+__version__ = "3.12.1"

{typedal-3.11.1 → typedal-3.12.1}/src/typedal/core.py

@@ -11,6 +11,7 @@ import math
 import sys
 import types
 import typing
+import uuid
 import warnings
 from collections import defaultdict
 from copy import copy
@@ -1179,11 +1180,21 @@ class TableMeta(type):
         Useful for joins when joining the same table multiple times.
 
         See Also:
-            http://web2py.com/books/default/chapter/29/06/the-database-abstraction-layer?search=export_to_csv_file#One-to-many-relation
+            http://web2py.com/books/default/chapter/29/06/the-database-abstraction-layer#One-to-many-relation
         """
         table = self._ensure_table_defined()
         return typing.cast(Type[T_MetaInstance], table.with_alias(alias))
 
+    def unique_alias(self: Type[T_MetaInstance]) -> Type[T_MetaInstance]:
+        """
+        Generates a unique alias for this table.
+
+        Useful for joins when joining the same table multiple times
+            and you don't want to keep track of aliases yourself.
+        """
+        key = f"{self.__name__.lower()}_{hash(uuid.uuid4())}"
+        return self.with_alias(key)
+
     # hooks:
     def before_insert(
         cls: Type[T_MetaInstance],
@@ -1270,7 +1281,7 @@ class TypedField(Expression, typing.Generic[T_Value]):  # pragma: no cover
 
     def __init__(
         self,
-        _type: Type[T_Value] | types.UnionType = str, # type: ignore
+        _type: Type[T_Value] | types.UnionType = str,  # type: ignore
         /,
         **settings: Unpack[FieldSettings],
     ) -> None:
@@ -2683,6 +2694,12 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
                 if not isinstance(on, list):  # pragma: no cover
                     on = [on]
 
+                on = [
+                    _
+                    for _ in on
+                    # only allow Expressions (query and such):
+                    if isinstance(_, pydal.objects.Expression)
+                ]
                 left.extend(on)
             elif method == "left":
                 # .on not given, generate it:
@@ -2826,10 +2843,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         db = self._get_db()
         query = self.__count(db, distinct=distinct)
 
-        return typing.cast(
-            str,
-            db(query)._count(distinct)
-        )
+        return typing.cast(str, db(query)._count(distinct))
 
     def exists(self) -> bool:
         """

{typedal-3.11.1 → typedal-3.12.1}/tests/test_relationships.py

@@ -25,10 +25,11 @@ class TaggableMixin:
         list["Tag"],
         # lambda self, _: (Tagged.entity == self.gid) & (Tagged.tag == Tag.id)
         # doing an .on with and & inside can lead to a cross join,
-        # for relationships with pivot tables a manual on query is prefered:
-        on=lambda entity, _tag: [
-            Tagged.on(Tagged.entity == entity.gid),
-            Tag.on((Tagged.tag == Tag.id)),
+        # for relationships with pivot tables a manual on query with aliases is prefered:
+        on=lambda entity, tag: [
+            tagged := Tagged.unique_alias(),
+            tagged.on(tagged.entity == entity.gid),
+            tag.on((tagged.tag == tag.id)),
         ],
     )
     # tags = relationship(list["Tag"], tagged)
@@ -186,7 +187,6 @@ def test_typedal_way():
         Empty.first_or_fail()
 
     # user through article: 1 - many
-
     all_articles = Article.join().collect().as_dict()
 
     assert all_articles[3]["final_editor"]["name"] == "Editor 1"