TypeDAL 3.16.3__py3-none-any.whl → 3.16.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.16.3"
+__version__ = "3.16.5"

typedal/core.py

@@ -2054,19 +2054,41 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
                 )
             # else: relationship, different logic:
 
-        for relation_name in row._with:
+        for relation_name in getattr(row, "_with", []):
             if relation := self._relationships.get(relation_name):
                 relation_table = relation.table
+                if isinstance(relation_table, str):
+                    relation_table = self._db[relation_table]
 
                 relation_row = row[relation_name]
-                for fieldname in relation_row:
-                    field = relation_table[fieldname]
-                    row[relation_name][fieldname] = self._db.represent(
-                        "rows_render",
-                        field,
-                        relation_row[field.name],
-                        relation_row,
-                    )
+
+                if isinstance(relation_row, list):
+                    # list of rows
+                    combined = []
+
+                    for related_og in relation_row:
+                        related = copy.deepcopy(related_og)
+                        for fieldname in related:
+                            field = relation_table[fieldname]
+                            related[field.name] = self._db.represent(
+                                "rows_render",
+                                field,
+                                related[field.name],
+                                related,
+                            )
+                        combined.append(related)
+
+                    row[relation_name] = combined
+                else:
+                    # 1 row
+                    for fieldname in relation_row:
+                        field = relation_table[fieldname]
+                        row[relation_name][fieldname] = self._db.represent(
+                            "rows_render",
+                            field,
+                            relation_row[field.name],
+                            relation_row,
+                        )
 
         if compact and len(keys) == 1 and keys[0] != "_extra":  # pragma: no cover
             return row[keys[0]]

{typedal-3.16.3.dist-info → typedal-3.16.5.dist-info}/METADATA

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

{typedal-3.16.3.dist-info → typedal-3.16.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-typedal/__about__.py,sha256=07zHmfNrgHIOSZ4D_zREzoRZ1Uy35o5sVinxkwxx-6k,207
+typedal/__about__.py,sha256=e0fosPOvZo8qNSX4V8VRAtwzAGVMRPU4yC9FAx0jjfk,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=33hzCFvCaiszDGBX05k0xoWFa4a3DJOXFgf5a9mkuvg,115189
+typedal/core.py,sha256=z0EsNEnUmfoHA2UWIUpRB_F3ptvLoKNG1SXX-cxh6L0,116127
 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=UYmD0_aK1bSVBt_f3j59Mxq-zOmQNkYkb8sPDUibq68,1539
 typedal/serializers/as_json.py,sha256=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.16.3.dist-info/METADATA,sha256=cRjhzaVmK3xSH8k4LrVdKoXifbtlgj6SjIwAAVrXnsc,10461
-typedal-3.16.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-typedal-3.16.3.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.16.3.dist-info/RECORD,,
+typedal-3.16.5.dist-info/METADATA,sha256=Uv3w_mVpZkVEKeM3hl8ROUuOoCJFZuIcx2F7fJipzb0,10461
+typedal-3.16.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+typedal-3.16.5.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.16.5.dist-info/RECORD,,