TypeDAL 3.9.2__tar.gz → 3.9.3__tar.gz

{typedal-3.9.2 → typedal-3.9.3}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.9.3 (2024-11-08)
+
+### Fix
+
+* **p4w:** Actually passing the 'uri' to connect to a database in singleton mode would be pretty useful no? ([`e29a0bb`](https://github.com/trialandsuccess/TypeDAL/commit/e29a0bbb1b3f954d7f8a3c13704952f8ec42a799))
+
 ## v3.9.2 (2024-11-08)
 
 ### Fix

{typedal-3.9.2 → typedal-3.9.3}/PKG-INFO

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

{typedal-3.9.2 → typedal-3.9.3}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = 'Typing support for PyDAL'
 readme = "README.md"
 requires-python = ">=3.10"
-#license = "MIT"
+# license = "MIT"
 keywords = []
 authors = [
     { name = "Robin van der Noord", email = "contact@trialandsuccess.nl" },

{typedal-3.9.2 → typedal-3.9.3}/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.9.2"
+__version__ = "3.9.3"

{typedal-3.9.2 → typedal-3.9.3}/src/typedal/for_py4web.py

@@ -27,7 +27,7 @@ class PY4WEB_DAL_SINGLETON(MetaDAL):
     def __call__(cls, uri: str, *args: typing.Any, **kwargs: typing.Any) -> AnyType:
         db_uid = kwargs.get("db_uid", hashlib_md5(repr(uri)).hexdigest())
         if db_uid not in cls._instances:
-            cls._instances[db_uid] = super().__call__(*args, **kwargs)
+            cls._instances[db_uid] = super().__call__(uri, *args, **kwargs)
 
         return cls._instances[db_uid]
 

{typedal-3.9.2 → typedal-3.9.3}/tests/test_py4web.py

@@ -60,9 +60,20 @@ def test_py4web_dal_singleton():
             db_2b = DAL("sqlite://test_py4web_dal_singleton", folder=d, enable_typedal_caching=False)
 
             assert db_1a is db_1b
+            assert db_1a._uri == db_1b._uri
+            assert db_1a._db_uid == db_1b._db_uid
+            
             assert db_2a is db_2b
+            assert db_2a._uri == db_2b._uri
+            assert db_2a._db_uid == db_2b._db_uid
+            
             assert db_1a is not db_2a
+            assert db_1a._uri != db_2a._uri
+            assert db_1a._db_uid != db_2a._db_uid
+            
             assert db_1b is not db_2b
-
+            assert db_1b._uri != db_2b._uri
+            assert db_1b._db_uid != db_2b._db_uid
+            
     # reset singletons for later use:
     DAL._clear()