TypeDAL 3.8.4__py3-none-any.whl → 3.9.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.8.4"
+__version__ = "3.9.0"

typedal/core.py

@@ -130,6 +130,7 @@ class Relationship(typing.Generic[To_Type]):
     _type: To_Type
     table: Type["TypedTable"] | type | str
     condition: Condition
+    condition_and: Condition
     on: OnQuery
     multiple: bool
     join: JOIN_OPTIONS
@@ -140,6 +141,7 @@ class Relationship(typing.Generic[To_Type]):
         condition: Condition = None,
         join: JOIN_OPTIONS = None,
         on: OnQuery = None,
+        condition_and: Condition = None,
     ):
         """
         Should not be called directly, use relationship() instead!
@@ -152,6 +154,7 @@ class Relationship(typing.Generic[To_Type]):
         self.condition = condition
         self.join = "left" if on else join  # .on is always left join!
         self.on = on
+        self.condition_and = condition_and
 
         if args := typing.get_args(_type):
             self.table = unwrap_type(args[0])
@@ -172,6 +175,7 @@ class Relationship(typing.Generic[To_Type]):
             update.get("condition") or self.condition,
             update.get("join") or self.join,
             update.get("on") or self.on,
+            update.get("condition_and") or self.condition_and,
         )
 
     def __repr__(self) -> str:
@@ -180,6 +184,10 @@ class Relationship(typing.Generic[To_Type]):
         """
         if callback := self.condition or self.on:
             src_code = inspect.getsource(callback).strip()
+
+            if c_and := self.condition_and:
+                and_code = inspect.getsource(c_and).strip()
+                src_code += " AND " + and_code
         else:
             cls_name = self._type if isinstance(self._type, str) else self._type.__name__  # type: ignore
             src_code = f"to {cls_name} (missing condition)"
@@ -1050,11 +1058,12 @@ class TableMeta(type):
         method: JOIN_OPTIONS = None,
         on: OnQuery | list[Expression] | Expression = None,
         condition: Condition = None,
+        condition_and: Condition = None,
     ) -> "QueryBuilder[T_MetaInstance]":
         """
         See QueryBuilder.join!
         """
-        return QueryBuilder(self).join(*fields, on=on, condition=condition, method=method)
+        return QueryBuilder(self).join(*fields, on=on, condition=condition, method=method, condition_and=condition_and)
 
     def collect(self: Type[T_MetaInstance], verbose: bool = False) -> "TypedRows[T_MetaInstance]":
         """
@@ -1500,7 +1509,14 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
             return None  # type: ignore
 
         inst._row = row
-        inst.__dict__.update(row)
+
+        if hasattr(row, "id"):
+            inst.__dict__.update(row)
+        else:
+            # deal with _extra (and possibly others?)
+            # Row <{actual: {}, _extra: ...}>
+            inst.__dict__.update(row[str(cls)])
+
         inst._setup_instance_methods()
         return inst
 
@@ -1828,7 +1844,22 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         `metadata` can be any (un)structured data
         `model` is a Typed Table class
         """
-        records = records or {row.id: model(row) for row in rows}
+
+        def _get_id(row: Row) -> int:
+            """
+            Try to find the id field in a row.
+
+            If _extra exists, the row changes:
+            <Row {'test_relationship': {'id': 1}, '_extra': {'COUNT("test_relationship"."querytable")': 8}}>
+            """
+            if idx := getattr(row, "id", None):
+                return typing.cast(int, idx)
+            elif main := getattr(row, str(model), None):
+                return typing.cast(int, main.id)
+            else:  # pragma: no cover
+                raise NotImplementedError(f"`id` could not be found for {row}")
+
+        records = records or {_get_id(row): model(row) for row in rows}
         super().__init__(rows.db, records, rows.colnames, rows.compact, rows.response, rows.fields)
         self.model = model
         self.metadata = metadata or {}
@@ -2295,6 +2326,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         method: JOIN_OPTIONS = None,
         on: OnQuery | list[Expression] | Expression = None,
         condition: Condition = None,
+        condition_and: Condition = None,
     ) -> "QueryBuilder[T_MetaInstance]":
         """
         Include relationship fields in the result.
@@ -2304,8 +2336,13 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
         By default, the `method` defined in the relationship is used.
             This can be overwritten with the `method` keyword argument (left or inner)
+
+        `condition_and` can be used to add extra conditions to an inner join.
         """
         # todo: allow limiting amount of related rows returned for join?
+        # todo: it would be nice if 'fields' could be an actual relationship
+        #   (Article.tags = list[Tag]) and you could change the .condition and .on
+        #  this could deprecate condition_and
 
         relationships = self.model.get_relationships()
 
@@ -2318,7 +2355,9 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
             if isinstance(condition, pydal.objects.Query):
                 condition = as_lambda(condition)
 
-            relationships = {str(fields[0]): Relationship(fields[0], condition=condition, join=method)}
+            relationships = {
+                str(fields[0]): Relationship(fields[0], condition=condition, join=method, condition_and=condition_and)
+            }
         elif on:
             if len(fields) != 1:
                 raise ValueError("join(field, on=...) can only be used with exactly one field!")
@@ -2328,15 +2367,17 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
             if isinstance(on, list):
                 on = as_lambda(on)
-            relationships = {str(fields[0]): Relationship(fields[0], on=on, join=method)}
+            relationships = {str(fields[0]): Relationship(fields[0], on=on, join=method, condition_and=condition_and)}
 
         else:
             if fields:
                 # join on every relationship
-                relationships = {str(k): relationships[str(k)] for k in fields}
+                relationships = {str(k): relationships[str(k)].clone(condition_and=condition_and) for k in fields}
 
             if method:
-                relationships = {str(k): r.clone(join=method) for k, r in relationships.items()}
+                relationships = {
+                    str(k): r.clone(join=method, condition_and=condition_and) for k, r in relationships.items()
+                }
 
         return self._extend(relationships=relationships)
 
@@ -2557,7 +2598,6 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
         metadata["relationships"] = set(self.relationships.keys())
 
-        # query = self._update_query_for_inner(db, model, query)
         join = []
         for key, relation in self.relationships.items():
             if not relation.condition or relation.join != "inner":
@@ -2565,7 +2605,11 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
             other = relation.get_table(db)
             other = other.with_alias(f"{key}_{hash(relation)}")
-            join.append(other.on(relation.condition(model, other)))
+            condition = relation.condition(model, other)
+            if callable(relation.condition_and):
+                condition &= relation.condition_and(model, other)
+
+            join.append(other.on(condition))
 
         if limitby := select_kwargs.pop("limitby", ()):
 
@@ -2615,12 +2659,12 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
                 # .on not given, generate it:
                 other = other.with_alias(f"{key}_{hash(relation)}")
                 condition = typing.cast(Query, relation.condition(model, other))
+                if callable(relation.condition_and):
+                    condition &= relation.condition_and(model, other)
                 left.append(other.on(condition))
             else:
                 # else: inner join (handled earlier)
                 other = other.with_alias(f"{key}_{hash(relation)}")  # only for replace
-                # other = other.with_alias(f"{key}_{hash(relation)}")
-                # query &= relation.condition(model, other)
 
             # if no fields of 'other' are included, add other.ALL
             # else: only add other.id if missing
@@ -2721,7 +2765,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         """
         yield from self.collect()
 
-    def count(self) -> int:
+    def count(self, distinct: bool = None) -> int:
         """
         Return the amount of rows matching the current query.
         """
@@ -2730,14 +2774,16 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         query = self.query
 
         for key, relation in self.relationships.items():
-            if not relation.condition or relation.join != "inner":
+            if (not relation.condition or relation.join != "inner") and not distinct:
                 continue
 
             other = relation.get_table(db)
-            other = other.with_alias(f"{key}_{hash(relation)}")
+            if not distinct:
+                # todo: can this lead to other issues?
+                other = other.with_alias(f"{key}_{hash(relation)}")
             query &= relation.condition(model, other)
 
-        return db(query).count()
+        return db(query).count(distinct)
 
     def __paginate(
         self,

{typedal-3.8.4.dist-info → typedal-3.9.0.dist-info}/METADATA

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

{typedal-3.8.4.dist-info → typedal-3.9.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=d3u5BMAb-o3c-QyqO-Md5FwDyd5-j9Je_83Jq3CDyjY,206
+typedal/__about__.py,sha256=ZuJhJWjiRvul81lGSU613j5iNkWmLFCmfexofoyuMao,206
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=SMcJsahLlZ79yykWCveERFx1ZJUNEKhA9SPmCTIuLp8,11798
 typedal/cli.py,sha256=wzyId6YwRyqfuJ2byxvl6YecDNaKpkLmo-R5HvRuTok,19265
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=hjUrpHGcw2MnUG0Rx9QE6L9TOXwxn5fArUtP3jNloUw,100475
+typedal/core.py,sha256=LQi-aE0j3n_JjSeYmUmZ1XhW4snt7SrxPSZ3DY_WV-k,102403
 typedal/fields.py,sha256=A4qt0aK4F_-UeOY-xJ0ObVY-tFEoLFy7TYRMHnp4g6o,6516
 typedal/for_py4web.py,sha256=d07b8hL_PvNDUS26Z5fDH2OxWb-IETBuAFPSzrRwm04,1285
 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.8.4.dist-info/METADATA,sha256=VgJ74rpykoi4ZdHfuDbGRJhNm6RON2noWyBgEsV2dMs,10463
-typedal-3.8.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.8.4.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.8.4.dist-info/RECORD,,
+typedal-3.9.0.dist-info/METADATA,sha256=GJ6GuOyCvWzkkQiZ3p8UVKoAxMtmZfCpQtxQeig7J3Y,10463
+typedal-3.9.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.9.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.9.0.dist-info/RECORD,,