TypeDAL 3.11.1__py3-none-any.whl → 3.12.0__py3-none-any.whl

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.0"

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.dist-info → typedal-3.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 3.11.1
+Version: 3.12.0
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues

{typedal-3.11.1.dist-info → typedal-3.12.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=FxEaTblLPFTyRApu557gN7IPsOOYvkcUlJquX4MlDDk,207
+typedal/__about__.py,sha256=JubUKNHdusOHh_ihG36I1-syCZC_hicLVOoqMvn-nlY,207
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
 typedal/cli.py,sha256=FInI6LuhCbJXhh6qAqXpaPPckdkIQKGydnGYOo0_cm8,19253
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=qqZtlRJKhUiEzjA7QKxovPpV9ety6PlUbskcrjZC-uQ,104054
+typedal/core.py,sha256=da5zTuvkMXnTlUyUH0Q_BTP83cnD7dAE5wsiUdvnsDw,104609
 typedal/fields.py,sha256=ThkI0_E6Oq_2Vj30j0AWHRSOLvUEPu1gyECtStoECjs,6556
 typedal/for_py4web.py,sha256=rE1kOXF6pUx0ya9jWMjGYaoFCpbYtjcYxccSvUo9o9M,1946
 typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
@@ -13,7 +13,7 @@ typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=VK9T8P5UwVLvfNBsY4q79ANcABv-jX76YKADt1Zz_co,1539
 typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
-typedal-3.11.1.dist-info/METADATA,sha256=8syVmQaBPZZ2d_8a_sJeT9g6PNEkpOzAqjP82ZoZS7o,10451
-typedal-3.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-typedal-3.11.1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.11.1.dist-info/RECORD,,
+typedal-3.12.0.dist-info/METADATA,sha256=iYWjdfSMqz11X8a4Elo7DUBI4RoZzjFTJTBuGq1MfeU,10451
+typedal-3.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+typedal-3.12.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.12.0.dist-info/RECORD,,