TypeDAL 3.9.0__tar.gz → 3.9.2__tar.gz

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

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v3.9.2 (2024-11-08)
+
+### Fix
+
+* Py4web-specific DAL now provides a singleton per db_uid, so different apps using shared typedal classes share a db instance, leading to less weird behavior (e.g. on `db.commit()`) ([`a2af3d5`](https://github.com/trialandsuccess/TypeDAL/commit/a2af3d52a3f14ddddd40ec326df9c2705ef26eca))
+
+## v3.9.1 (2024-10-25)
+
+### Fix
+
+* Bool(QueryBuilder) should NOT look at the data but if any filters were applied ([`962ddf3`](https://github.com/trialandsuccess/TypeDAL/commit/962ddf37f5d1ac014b73fd6349099100cc7efb5f))
+
 ## v3.9.0 (2024-10-25)
 
 ### Feature

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

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: TypeDAL
-Version: 3.9.0
+Version: 3.9.2
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
 Project-URL: Source, https://github.com/trialandsuccess/TypeDAL
 Author-email: Robin van der Noord <contact@trialandsuccess.nl>
-License-Expression: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10

{typedal-3.9.0 → typedal-3.9.2}/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.0 → typedal-3.9.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.9.0"
+__version__ = "3.9.2"

{typedal-3.9.0 → typedal-3.9.2}/src/typedal/core.py

@@ -2230,9 +2230,19 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
 
     def __bool__(self) -> bool:
         """
-        Querybuilder is truthy if it has rows.
+        Querybuilder is truthy if it has any conditions.
         """
-        return self.count() > 0
+        table = self.model._ensure_table_defined()
+        default_query = typing.cast(Query, table.id > 0)
+        return any(
+            [
+                self.query != default_query,
+                self.select_args,
+                self.select_kwargs,
+                self.relationships,
+                self.metadata,
+            ]
+        )
 
     def _extend(
         self,

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

@@ -2,9 +2,13 @@
 ONLY USE IN COMBINATION WITH PY4WEB!
 """
 
+import typing
+
 import threadsafevariable
+from configuraptor.abs import AnyType
 from py4web.core import ICECUBE
 from py4web.core import Fixture as _Fixture
+from pydal.base import MetaDAL, hashlib_md5
 
 from .core import TypeDAL
 from .types import AnyDict
@@ -17,7 +21,21 @@ class Fixture(_Fixture):  # type: ignore
     """
 
 
-class DAL(TypeDAL, Fixture):  # pragma: no cover
+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())
+        if db_uid not in cls._instances:
+            cls._instances[db_uid] = super().__call__(*args, **kwargs)
+
+        return cls._instances[db_uid]
+
+    def _clear(cls) -> None:
+        cls._instances.clear()
+
+
+class DAL(TypeDAL, Fixture, metaclass=PY4WEB_DAL_SINGLETON):  # pragma: no cover
     """
     Fixture similar to the py4web pydal fixture, but for typedal.
     """

{typedal-3.9.0 → typedal-3.9.2}/tests/test_main.py

@@ -414,6 +414,23 @@ def test_hooks(capsys):
     assert "before delete" in captured.out
     assert "after delete" in captured.out
 
+    idx = db.hooked_table.insert(name="Steve 2")
+    steve2 = db.hooked_table(idx)
+    captured = capsys.readouterr()
+
+    assert "before insert" in captured.out
+    assert "after insert 2" in captured.out
+
+    steve2.update_record(name="Not Steve")
+    captured = capsys.readouterr()
+    assert "before update" in captured.out
+    assert "after update" in captured.out
+
+    steve2.delete_record()
+    captured = capsys.readouterr()
+    assert "before delete" in captured.out
+    assert "after delete" in captured.out
+
 
 def test_hooks_v2(capsys):
     @db.define()
@@ -445,6 +462,23 @@ def test_hooks_v2(capsys):
     assert "before delete" in captured.out
     assert "after delete" in captured.out
 
+    idx = db.hooked_table_v2.insert(name="Steve 2")
+    steve2 = db.hooked_table_v2(idx)
+    captured = capsys.readouterr()
+
+    assert "before insert" in captured.out
+    assert "after insert 2" in captured.out
+
+    steve2.update_record(name="Not Steve")
+    captured = capsys.readouterr()
+    assert "before update" in captured.out
+    assert "after update" in captured.out
+
+    steve2.delete_record()
+    captured = capsys.readouterr()
+    assert "before delete" in captured.out
+    assert "after delete" in captured.out
+
 
 def test_try():
     class SomeTableToRetry(TypedTable):

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

@@ -1,4 +1,6 @@
 import json
+import tempfile
+from contextlib import chdir
 
 from pydal.validators import IS_EMAIL, IS_NOT_IN_DB
 
@@ -44,3 +46,23 @@ def test_auth_user():
 
     assert isinstance(requirements[0], IS_EMAIL)
     assert isinstance(requirements[1], IS_NOT_IN_DB)
+
+
+def test_py4web_dal_singleton():
+    with tempfile.TemporaryDirectory() as d:
+        with chdir(d):
+            # note: typedal caching is disabled here because otherwise the cache table might send logs to {d}/log.sql
+            # which can lead to problems in other tests :(
+            db_1a = DAL("sqlite:memory", enable_typedal_caching=False)
+            db_1b = DAL("sqlite:memory", enable_typedal_caching=False)
+
+            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)
+
+            assert db_1a is db_1b
+            assert db_2a is db_2b
+            assert db_1a is not db_2a
+            assert db_1b is not db_2b
+
+    # reset singletons for later use:
+    DAL._clear()

{typedal-3.9.0 → typedal-3.9.2}/tests/test_query_builder.py

@@ -401,8 +401,15 @@ def test_complex_join():
 
 def test_reprs_and_bool():
     _setup_data()
-    assert TestQueryTable.where(id=1)
-    assert not TestQueryTable.where(id=101)
+
+    # NOTE: This logic changed: any 'empty' query table is False, and adding any conditions make it True.
+    empty = TestQueryTable.where()
+    notempty = TestQueryTable.where(id=1)
+    assert (empty or notempty) is notempty
+    assert (notempty or empty) is notempty
+    assert not empty
+    assert notempty
+    assert TestQueryTable.where(id=10000000000)
 
     assert repr(TestQueryTable.where(id=1))
     assert str(TestQueryTable.where(id=1))