TypeDAL 3.8.3__py3-none-any.whl → 3.8.5__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.3"
+__version__ = "3.8.5"

typedal/core.py

@@ -1500,7 +1500,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 +1835,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 {}
@@ -2721,7 +2743,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,25 +2752,27 @@ 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,
         limit: int,
         page: int = 1,
     ) -> "QueryBuilder[T_MetaInstance]":
-        _from = limit * (page - 1)
-        _to = limit * page
-
         available = self.count()
 
+        _from = limit * (page - 1)
+        _to = (limit * page) if limit else available
+
         metadata: Metadata = {}
 
         metadata["pagination"] = {

{typedal-3.8.3.dist-info → typedal-3.8.5.dist-info}/METADATA

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

{typedal-3.8.3.dist-info → typedal-3.8.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=SarIMCiZlYmiG5KBKqJFOtLclRO1_iDhCaU4inLWXCU,206
+typedal/__about__.py,sha256=bvQs_IhdRXwl5i7SVQ_hGOKt-LVVmnzTgIq29Sdi698,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=UjaB36QLOor7O7mMpB7ofrr22yqDSER_-5x9Z0kzVDQ,100449
+typedal/core.py,sha256=3puxKj57FvZjR4JUt2926e9eSPnOSaE9hbe2w2M7PyM,101411
 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.3.dist-info/METADATA,sha256=XZ4R1WYyw0S9yXrFhpF2okaxYPw39BlzHzTrydBadQ4,10463
-typedal-3.8.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.8.3.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.8.3.dist-info/RECORD,,
+typedal-3.8.5.dist-info/METADATA,sha256=z0OMhwDSKy8WskcYeYwrLtaGHv7GZzET7qENGoiv4PY,10463
+typedal-3.8.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.8.5.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.8.5.dist-info/RECORD,,