TypeDAL 3.14.3__py3-none-any.whl → 3.15.1__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.14.3"
+__version__ = "3.15.1"

typedal/core.py

@@ -120,7 +120,8 @@ OnQuery: typing.TypeAlias = typing.Optional[
     ]
 ]
 
-To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+# To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+To_Type = typing.TypeVar("To_Type")
 
 
 class Relationship(typing.Generic[To_Type]):
@@ -201,6 +202,7 @@ class Relationship(typing.Generic[To_Type]):
         Get the table this relationship is bound to.
         """
         table = self.table  # can be a string because db wasn't available yet
+
         if isinstance(table, str):
             if mapped := db._class_map.get(table):
                 # yay
@@ -249,7 +251,9 @@ class Relationship(typing.Generic[To_Type]):
             return None
 
 
-def relationship(_type: To_Type, condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None) -> To_Type:
+def relationship(
+    _type: typing.Type[To_Type], condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None
+) -> To_Type:
     """
     Define a relationship to another table, when its id is not stored in the current table.
 
@@ -584,7 +588,9 @@ class TypeDAL(pydal.DAL):  # type: ignore
                 # by now, all relationships should be instances!
                 relationships=typing.cast(dict[str, Relationship[Any]], relationships),
             )
+            # map both name and rname:
             self._class_map[str(table)] = cls
+            self._class_map[table._rname] = cls
             cls.__on_define__(self)
         else:
             warnings.warn("db.define used without inheriting TypedTable. This could lead to strange problems!")
@@ -713,7 +719,7 @@ class TypeDAL(pydal.DAL):  # type: ignore
         table class matches the input name.
 
         Args:
-            table_name: The name of the table to retrieve the mapped class for.
+            table_name: The rname of the table to retrieve the mapped class for.
 
         Returns:
             The mapped table class if it exists, otherwise None.
@@ -2434,7 +2440,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
     def where(
         self,
-        *queries_or_lambdas: Query | typing.Callable[[Type[T_MetaInstance]], Query],
+        *queries_or_lambdas: Query | typing.Callable[[Type[T_MetaInstance]], Query] | dict,
         **filters: Any,
     ) -> "QueryBuilder[T_MetaInstance]":
         """
@@ -2453,20 +2459,28 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         new_query = self.query
         table = self.model._ensure_table_defined()
 
-        for field, value in filters.items():
-            new_query &= table[field] == value
+        queries_or_lambdas = (
+            *queries_or_lambdas,
+            filters,
+        )
 
         subquery: DummyQuery | Query = DummyQuery()
-        for query_or_lambda in queries_or_lambdas:
-            if isinstance(query_or_lambda, _Query):
-                subquery |= typing.cast(Query, query_or_lambda)
-            elif callable(query_or_lambda):
-                if result := query_or_lambda(self.model):
+        for query_part in queries_or_lambdas:
+            if isinstance(query_part, _Query):
+                subquery |= typing.cast(Query, query_part)
+            elif callable(query_part):
+                if result := query_part(self.model):
                     subquery |= result
-            elif isinstance(query_or_lambda, (Field, _Field)) or is_typed_field(query_or_lambda):
-                subquery |= typing.cast(Query, query_or_lambda != None)
+            elif isinstance(query_part, (Field, _Field)) or is_typed_field(query_part):
+                subquery |= typing.cast(Query, query_part != None)
+            elif isinstance(query_part, dict):
+                subsubquery = DummyQuery()
+                for field, value in query_part.items():
+                    subsubquery &= table[field] == value
+                if subsubquery:
+                    subquery |= subsubquery
             else:
-                raise ValueError(f"Unexpected query type ({type(query_or_lambda)}).")
+                raise ValueError(f"Unexpected query type ({type(query_part)}).")
 
         if subquery:
             new_query &= subquery

{typedal-3.14.3.dist-info → typedal-3.15.1.dist-info}/METADATA

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

{typedal-3.14.3.dist-info → typedal-3.15.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=Ybj7WLRqCZenUAKsMy7nfQIS_YJfO5wEBBmLNUtp7wQ,207
+typedal/__about__.py,sha256=Xso865lLoa6uJvYh9ngF2KTTM3rcjIC6XYtR4N1ioLk,207
 typedal/__init__.py,sha256=Y6LT5UE3HrfWND_drJddYFbDjfnvqQER8MxZiEREFGw,366
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
 typedal/cli.py,sha256=SnWceLPDd-t90VPHAV9O3RR7JZtpVniT55TqtrRv3VM,19255
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=GYNX7aGaqaPWZUYTxiNDAswQi7jeP87qAlYk1OzCO5g,108942
+typedal/core.py,sha256=kC6CBUPExNAytOUggcPb1jIv_X1LrHayCEAkcT80GjY,109332
 typedal/fields.py,sha256=oOmTonXG-g4Lpj5_gSr8GJ-EZIEqO435Fm8-MS_cmoc,7356
 typedal/for_py4web.py,sha256=KIIu8XgnAfRQCJfZCra79k8SInOHiFuLDKUv3hzTJng,1908
 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=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.14.3.dist-info/METADATA,sha256=Zuxsdy0jCzjUwGvkxIRtIJNfxpxL03J_2QAOlFHr1bk,10461
-typedal-3.14.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.14.3.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.14.3.dist-info/RECORD,,
+typedal-3.15.1.dist-info/METADATA,sha256=-pJVFoXvP9KrqiyAvXxDkhqQ3hE7eVRLdtcgMNNEis4,10461
+typedal-3.15.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.15.1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.15.1.dist-info/RECORD,,