TypeDAL 3.15.1__tar.gz → 3.15.2__tar.gz

{typedal-3.15.1 → typedal-3.15.2}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.15.2 (2025-07-24)
+
+### Fix
+
+* Store `._rows` in table entry to access raw data (including untyped relationships via associative table for example) ([`cfdaa09`](https://github.com/trialandsuccess/TypeDAL/commit/cfdaa09c70a7b2056f56b55fbddb6b5e65f9ad33))
+
 ## v3.15.1 (2025-07-14)
 
 ### Fix

{typedal-3.15.1 → typedal-3.15.2}/PKG-INFO

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

{typedal-3.15.1 → typedal-3.15.2}/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.15.1"
+__version__ = "3.15.2"

{typedal-3.15.1 → typedal-3.15.2}/src/typedal/core.py

@@ -9,6 +9,7 @@ import functools
 import inspect
 import json
 import math
+import re
 import sys
 import types
 import typing
@@ -1608,6 +1609,7 @@ class TypedTable(_TypedTable, metaclass=TableMeta):
 
     # set up by 'new':
     _row: Row | None = None
+    _rows: tuple[Row, ...] = ()
 
     _with: list[str]
 
@@ -1980,6 +1982,7 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         model: Type[T_MetaInstance],
         records: dict[int, T_MetaInstance] = None,
         metadata: Metadata = None,
+        raw: dict[int, list[Row]] = None,
     ) -> None:
         """
         Should not be called manually!
@@ -2005,6 +2008,11 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
                 raise NotImplementedError(f"`id` could not be found for {row}")
 
         records = records or {_get_id(row): model(row) for row in rows}
+        raw = raw or {}
+
+        for idx, entity in records.items():
+            entity._rows = tuple(raw.get(idx, []))
+
         super().__init__(rows.db, records, rows.colnames, rows.compact, rows.response, rows.fields)
         self.model = model
         self.metadata = metadata or {}
@@ -2321,6 +2329,29 @@ from .caching import (  # noqa: E402
 )
 
 
+def normalize_table_keys(row: Row, pattern: re.Pattern = re.compile(r"^([a-zA-Z_]+)_(\d{5,})$")) -> Row:
+    """
+    Normalize table keys in a PyDAL Row object by stripping numeric hash suffixes
+    from table names, only if the suffix is 5 or more digits.
+
+    For example:
+        Row({'articles_12345': {...}}) -> Row({'articles': {...}})
+        Row({'articles_123': {...}})   -> unchanged
+
+    Returns:
+        Row: A new Row object with normalized keys.
+    """
+    new_data: dict[str, Any] = {}
+    for key, value in row.items():
+        if match := pattern.match(key):
+            base, _suffix = match.groups()
+            normalized_key = base
+            new_data[normalized_key] = value
+        else:
+            new_data[key] = value
+    return Row(new_data)
+
+
 class QueryBuilder(typing.Generic[T_MetaInstance]):
     """
     Abstration on top of pydal's query system.
@@ -2864,13 +2895,20 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         db = self._get_db()
         main_table = self.model._ensure_table_defined()
 
+        # id: Model
         records = {}
+
+        # id: [Row]
+        raw_per_id = defaultdict(list)
+
         seen_relations: dict[str, set[str]] = defaultdict(set)  # main id -> set of col + id for relation
 
         for row in rows:
             main = row[main_table]
             main_id = main.id
 
+            raw_per_id[main_id].append(normalize_table_keys(row))
+
             if main_id not in records:
                 records[main_id] = self.model(main)
                 records[main_id]._with = list(self.relationships.keys())
@@ -2915,7 +2953,7 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
                     # create single T
                     records[main_id][column] = instance
 
-        return _to(rows, self.model, records, metadata=metadata)
+        return _to(rows, self.model, records, metadata=metadata, raw=raw_per_id)
 
     def collect_or_fail(self, exception: typing.Optional[Exception] = None) -> "TypedRows[T_MetaInstance]":
         """

{typedal-3.15.1 → typedal-3.15.2}/tests/test_relationships.py

@@ -620,3 +620,19 @@ def test_count_with_join():
 
     assert User.where(id=4).join("articles").count(User.id) == 1
     assert User.where(id=4).join("articles").count(Article.id) == 2
+
+
+def test_accessing_raw_data():
+    _setup_data()
+
+    user = User.where(id=4).join("articles").first()
+
+    # <User({"id": 4, "name": "Untagged Author", "roles": [], "gid": "967da807-eb13-46dc-a0f3-d5c04751edf4", "main_role": 2, "extra_roles": []}) + ['articles']>
+    assert user._row
+
+    # one row per user+article combination like how postgres returns it:
+    assert len(user._rows) == 2
+
+    assert {row.user.id for row in user._rows} == {4}
+
+    assert {row.articles.id for row in user._rows} == {1, 2}