TypeDAL 3.14.3__tar.gz → 3.15.0__tar.gz

{typedal-3.14.3 → typedal-3.15.0}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.15.0 (2025-06-23)
+
+### Feature
+
+* **querybuilder:** Support dictionaries (AND) in where (table.where({"example": "selection, "with": "dictionary")) ([`67837f8`](https://github.com/trialandsuccess/TypeDAL/commit/67837f82b13246ca2a526141e8e3915167fe3369))
+
 ## v3.14.3 (2025-06-09)
 
 ### Fix

{typedal-3.14.3 → typedal-3.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 3.14.3
+Version: 3.15.0
 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 → typedal-3.15.0}/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.14.3"
+__version__ = "3.15.0"

{typedal-3.14.3 → typedal-3.15.0}/src/typedal/core.py

@@ -2434,7 +2434,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 +2453,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 → typedal-3.15.0}/tests/test_query_builder.py

@@ -153,7 +153,25 @@ def test_where_builder():
     # test OR
 
     assert TestQueryTable.where(lambda row: row.id == 1, lambda row: row.id == 2).count() == 2
+    assert (
+        TestQueryTable.where(
+            {"id": 1},
+            {  # OR
+                "id": 2
+            },
+        ).count()
+        == 2
+    )
+
     assert TestQueryTable.where(lambda row: row.id == 1, lambda row: row.id == 99).count() == 1
+    assert (
+        TestQueryTable.where(
+            {"id": 1},
+            # OR
+            {"id": 99},
+        ).count()
+        == 1
+    )
 
     assert TestQueryTable.where(id=-1).first() is None
     with pytest.raises(ValueError):