TypeDAL 3.9.2__tar.gz → 3.9.4__tar.gz

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

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.9.4 (2024-11-10)
+
+### Fix
+
+* **p4w:** Calling `for_py4web.DAL()` without any arguments (to load from config) should work even with singleton ([`16f9e68`](https://github.com/trialandsuccess/TypeDAL/commit/16f9e681eaac2fccd06a110031c0d55261a0a7e9))
+
+## 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.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 3.9.2
+Version: 3.9.4
 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.4}/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.4}/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.4"

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

@@ -24,10 +24,10 @@ class Fixture(_Fixture):  # type: ignore
 class PY4WEB_DAL_SINGLETON(MetaDAL):
     _instances: typing.ClassVar[typing.MutableMapping[str, AnyType]] = {}
 
-    def __call__(cls, uri: str, *args: typing.Any, **kwargs: typing.Any) -> AnyType:
-        db_uid = kwargs.get("db_uid", hashlib_md5(repr(uri)).hexdigest())
+    def __call__(cls, uri: typing.Optional[str] = None, *args: typing.Any, **kwargs: typing.Any) -> AnyType:
+        db_uid = kwargs.get("db_uid", hashlib_md5(repr(uri or (args, kwargs))).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.4}/tests/test_py4web.py

@@ -1,12 +1,13 @@
 import json
 import tempfile
-from contextlib import chdir
+from contextlib_chdir import chdir
 
 from pydal.validators import IS_EMAIL, IS_NOT_IN_DB
 
 from src.typedal import TypedTable
 from src.typedal.for_py4web import DAL, AuthUser, setup_py4web_tables
 from src.typedal.serializers import as_json
+from typedal.config import TypeDALConfig
 
 db = DAL("sqlite:memory")
 
@@ -59,10 +60,38 @@ def test_py4web_dal_singleton():
             db_2a = DAL("sqlite://test_py4web_dal_singleton", folder=d, enable_typedal_caching=False)
             db_2b = DAL("sqlite://test_py4web_dal_singleton", folder=d, enable_typedal_caching=False)
 
+            conf = {
+                "database": "sqlite:memory",
+                "dialect": "sqlite",
+                "pyproject": "",
+                "flag_location": f"{d}/flags"
+            }
+            db_3a = DAL(config=TypeDALConfig.load(conf))
+            db_3b = DAL(config=TypeDALConfig.load(conf))
+
             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
+
+            assert db_3a is db_3b
+            assert db_3a is not db_1a
+            assert db_3a is not db_2a
+
+            assert db_1a._uri == db_1b._uri
+            assert db_3a._uri == db_1a._uri
+            assert db_3a._uri != db_2a._uri
 
     # reset singletons for later use:
     DAL._clear()