TypeDAL 2.1.0b1__py3-none-any.whl → 2.1.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__ = "2.1.0-beta.1"
+__version__ = "2.1.2"

typedal/core.py

@@ -392,8 +392,18 @@ class TypeDAL(pydal.DAL):  # type: ignore
         )
 
         if enable_typedal_caching:
-            self.define(_TypedalCache, migrate=True)
-            self.define(_TypedalCacheDependency, migrate=True)
+            self.try_define(_TypedalCache)
+            self.try_define(_TypedalCacheDependency)
+
+    def try_define(self, model: typing.Type[T]) -> typing.Type[T]:
+        """
+        Try to define a model with migrate or fall back to fake migrate.
+        """
+        try:
+            return self.define(model, migrate=True)
+        except Exception as e:
+            warnings.warn(f"{model} could not be migrated, try faking", source=e, category=RuntimeWarning)
+            return self.define(model, migrate=False, fake_migrate=True, redefine=True)
 
     default_kwargs: typing.ClassVar[typing.Dict[str, Any]] = {
         # fields are 'required' (notnull) by default:

typedal/for_py4web.py

@@ -40,6 +40,7 @@ class AuthUser(TypedTable):
     """
     Class for db.auth_user in py4web (probably not w2p).
     """
+
     redefine = True
     migrate = False
 
@@ -52,6 +53,6 @@ class AuthUser(TypedTable):
     sso_id: Optional[str]
     action_token: Optional[str]
     last_password_change: Optional[datetime]
-    past_passwords_hash: Optional[str]
-    username: Optional[str]
-    phone_number: Optional[str]
+    # past_passwords_hash: Optional[str]
+    # username: Optional[str]
+    # phone_number: Optional[str]

{typedal-2.1.0b1.dist-info → typedal-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TypeDAL
-Version: 2.1.0b1
+Version: 2.1.2
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://github.com/trialandsuccess/TypeDAL#readme
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues
@@ -241,10 +241,6 @@ See [2. Defining Tables](docs/2_defining_tables.md)
 
 This section contains a non-exhaustive list of planned features for future feature releases:
 
-- 2.1
-    - Caching: adding a `.cache()` operation to the query builder which loads a repeated execution from cache (via
-      pickling of the final object). Optionally, dependency tracking could be added to automatically expire cache items
-      when one of the underlying objects have changed in the database.
 - 2.2
     - Migrations: currently, you can use pydal's automatic migrations or disable those and manage them yourself, but
       adding something like [`edwh-migrate`](https://github.com/educationwarehouse/migrate#readme)

{typedal-2.1.0b1.dist-info → typedal-2.1.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-typedal/__about__.py,sha256=hJJXow4iU5j5aWvmQ3XxQc0NZXGSWZhWLi_S-TiZ7z0,213
+typedal/__about__.py,sha256=XIq50NymG7YOcrBFkUvu04Mbp2u9ABbGkAd5IxGHBCI,206
 typedal/__init__.py,sha256=QQpLiVl9w9hm2LBxey49Y_tCF_VB2bScVaS_mCjYy54,366
 typedal/caching.py,sha256=53WU5J_yRLygkKoDfD0rV_dkh5oqqT--64R9Mvz050Y,7457
-typedal/core.py,sha256=PEvy9xlR2ZtvxFwT7LDd5tTatWoGiIHLVbDatvOjKO8,91204
+typedal/core.py,sha256=6iZHSE82Cj9S-YXeAJWvBEnks7rVE6AKxLjCP2kK94Y,91639
 typedal/fields.py,sha256=z2PD9vLWqBR_zXtiY0DthqTG4AeF3yxKoeuVfGXnSdg,5197
-typedal/for_py4web.py,sha256=HQTMy7Vfj_gu2jhrcF0KCmhMj203wITYwKjMi3uB0x4,1453
+typedal/for_py4web.py,sha256=NN6GxZpp971HFxqiI5QZaNQYydsEvJh1TctxKuZE5pw,1460
 typedal/helpers.py,sha256=ZpHdwBMSANw-P9I5gs56Vf6GUbxGzFsIwbBvASKXX8s,6487
 typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=AADKhLbBotpDm5FM__fhvaRNGoHPjG-LcxflnjvhOz0,3011
-typedal-2.1.0b1.dist-info/METADATA,sha256=OvEDmtARST4kLF4fQYuYEPDQTIRmtCpdrLZNrIaUiIo,7742
-typedal-2.1.0b1.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
-typedal-2.1.0b1.dist-info/RECORD,,
+typedal-2.1.2.dist-info/METADATA,sha256=nSrRdfHMqXOB5WEHpze57T_6uGY3QBuR5URRa1lvig8,7428
+typedal-2.1.2.dist-info/WHEEL,sha256=KGYbc1zXlYddvwxnNty23BeaKzh7YuoSIvIMO4jEhvw,87
+typedal-2.1.2.dist-info/RECORD,,