TypeDAL 3.15.0__tar.gz → 3.15.1__tar.gz

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

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.15.1 (2025-07-14)
+
+### Fix
+
+* **find_model:** Map both name and rname ([`e402d66`](https://github.com/trialandsuccess/TypeDAL/commit/e402d6659516d119fd3bd3fc28cea32b360aa068))
+
 ## v3.15.0 (2025-06-23)
 
 ### Feature

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

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

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

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

@@ -120,7 +120,8 @@ OnQuery: typing.TypeAlias = typing.Optional[
     ]
 ]
 
-To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+# To_Type = typing.TypeVar("To_Type", type[Any], Type[Any], str)
+To_Type = typing.TypeVar("To_Type")
 
 
 class Relationship(typing.Generic[To_Type]):
@@ -201,6 +202,7 @@ class Relationship(typing.Generic[To_Type]):
         Get the table this relationship is bound to.
         """
         table = self.table  # can be a string because db wasn't available yet
+
         if isinstance(table, str):
             if mapped := db._class_map.get(table):
                 # yay
@@ -249,7 +251,9 @@ class Relationship(typing.Generic[To_Type]):
             return None
 
 
-def relationship(_type: To_Type, condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None) -> To_Type:
+def relationship(
+    _type: typing.Type[To_Type], condition: Condition = None, join: JOIN_OPTIONS = None, on: OnQuery = None
+) -> To_Type:
     """
     Define a relationship to another table, when its id is not stored in the current table.
 
@@ -584,7 +588,9 @@ class TypeDAL(pydal.DAL):  # type: ignore
                 # by now, all relationships should be instances!
                 relationships=typing.cast(dict[str, Relationship[Any]], relationships),
             )
+            # map both name and rname:
             self._class_map[str(table)] = cls
+            self._class_map[table._rname] = cls
             cls.__on_define__(self)
         else:
             warnings.warn("db.define used without inheriting TypedTable. This could lead to strange problems!")
@@ -713,7 +719,7 @@ class TypeDAL(pydal.DAL):  # type: ignore
         table class matches the input name.
 
         Args:
-            table_name: The name of the table to retrieve the mapped class for.
+            table_name: The rname of the table to retrieve the mapped class for.
 
         Returns:
             The mapped table class if it exists, otherwise None.

{typedal-3.15.0 → typedal-3.15.1}/tests/test_main.py

@@ -171,6 +171,10 @@ def test_mixed_defines(capsys):
     assert db.find_model("first_new_syntax") is FirstNewSyntax
     assert db.find_model("second_new_syntax") is SecondNewSyntax
 
+    assert db.find_model(db.old_syntax._rname) is None
+    assert db.find_model(FirstNewSyntax._rname) is FirstNewSyntax
+    assert db.find_model(SecondNewSyntax._rname) is SecondNewSyntax
+
 
 def test_dont_allow_bool_in_query():
     with pytest.raises(ValueError):

{typedal-3.15.0 → typedal-3.15.1}/tests/test_query_builder.py

@@ -222,8 +222,12 @@ def test_select():
     assert not partial.number
     assert not partial.yet_another
 
-    assert not partial.relations[0].name
-    assert partial.relations[0].value
+    other = partial.relations[0]
+
+    assert isinstance(other, TestRelationship)
+
+    assert not other.name
+    assert other.value
 
 
 def test_paginate():