TypeDAL 3.9.0__py3-none-any.whl → 3.9.2__py3-none-any.whl

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/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/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.dist-info → typedal-3.9.2.dist-info}/METADATA

@@ -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.dist-info → typedal-3.9.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-typedal/__about__.py,sha256=ZuJhJWjiRvul81lGSU613j5iNkWmLFCmfexofoyuMao,206
+typedal/__about__.py,sha256=HjOL8WWOSXGjZPI6ywVgMyu8Zpp8670DqkRZsl5aZzs,206
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=SMcJsahLlZ79yykWCveERFx1ZJUNEKhA9SPmCTIuLp8,11798
 typedal/cli.py,sha256=wzyId6YwRyqfuJ2byxvl6YecDNaKpkLmo-R5HvRuTok,19265
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=LQi-aE0j3n_JjSeYmUmZ1XhW4snt7SrxPSZ3DY_WV-k,102403
+typedal/core.py,sha256=OBokUmNBvm83REIEKUjjIXna5UWSXC5H8M82LiAag0M,102729
 typedal/fields.py,sha256=A4qt0aK4F_-UeOY-xJ0ObVY-tFEoLFy7TYRMHnp4g6o,6516
-typedal/for_py4web.py,sha256=d07b8hL_PvNDUS26Z5fDH2OxWb-IETBuAFPSzrRwm04,1285
+typedal/for_py4web.py,sha256=YmGkbJ620zvGqdSmN2U0BmvdujZo_HI7-mUIVmvSvBw,1899
 typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
 typedal/helpers.py,sha256=uej96exzJ9qVBd6LudP8uJ_7Cmq6vKraerdKvSRBVjc,8128
 typedal/mixins.py,sha256=6QfeVBAk7J4uHSR82Ek_Bhq43hzxnrmLn6xqxZqYtMk,5757
@@ -13,7 +13,7 @@ typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=VK9T8P5UwVLvfNBsY4q79ANcABv-jX76YKADt1Zz_co,1539
 typedal/serializers/as_json.py,sha256=ffo152W-sARYXym4BzwX709rrO2-QwKk2KunWY8RNl4,2229
-typedal-3.9.0.dist-info/METADATA,sha256=GJ6GuOyCvWzkkQiZ3p8UVKoAxMtmZfCpQtxQeig7J3Y,10463
-typedal-3.9.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-typedal-3.9.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.9.0.dist-info/RECORD,,
+typedal-3.9.2.dist-info/METADATA,sha256=fzTJVyf4WHOP0UABFFXPlLzV_fiHzOOiUpSYZFeCtQE,10439
+typedal-3.9.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+typedal-3.9.2.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.9.2.dist-info/RECORD,,