TypeDAL 3.17.0__py3-none-any.whl → 3.17.1__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.17.0"
+__version__ = "3.17.1"

typedal/core.py

@@ -835,10 +835,10 @@ class TypeDAL(pydal.DAL):  # type: ignore
     def sql_expression(
         self,
         sql_fragment: str,
-        *raw_args: str,
+        *raw_args: Any,
         output_type: str | None = None,
-        **raw_kwargs: str,
-    ) -> str:
+        **raw_kwargs: Any,
+    ) -> Expression:
         """
         Creates a pydal Expression object representing a raw SQL fragment.
 

typedal/helpers.py

@@ -337,6 +337,26 @@ class classproperty:
         return self.fget(owner)
 
 
+def smarter_adapt(db: TypeDAL, placeholder: Any) -> str:
+    """
+    Smarter adaptation of placeholder to quote if needed.
+
+    Args:
+        db: Database object.
+        placeholder: Placeholder object.
+
+    Returns:
+        Quoted placeholder if needed, except for numbers (smart_adapt logic)
+            or fields/tables (use already quoted rname).
+    """
+    return typing.cast(
+        str,
+        getattr(placeholder, "sql_shortref", None)  # for tables
+        or getattr(placeholder, "sqlsafe", None)  # for fields
+        or db._adapter.smart_adapt(placeholder),  # for others
+    )
+
+
 def sql_escape(db: TypeDAL, sql_fragment: str, *raw_args: Any, **raw_kwargs: Any) -> str:
     """
     Generates escaped SQL fragments with placeholders.
@@ -358,18 +378,18 @@ def sql_escape(db: TypeDAL, sql_fragment: str, *raw_args: Any, **raw_kwargs: Any
 
     elif raw_args:
         # list
-        return sql_fragment % tuple(db._adapter.adapt(placeholder) for placeholder in raw_args)
+        return sql_fragment % tuple(smarter_adapt(db, placeholder) for placeholder in raw_args)
     else:
         # dict
-        return sql_fragment % {key: db._adapter.adapt(placeholder) for key, placeholder in raw_kwargs.items()}
+        return sql_fragment % {key: smarter_adapt(db, placeholder) for key, placeholder in raw_kwargs.items()}
 
 
 def sql_expression(
     db: TypeDAL,
     sql_fragment: str,
-    *raw_args: str,
+    *raw_args: Any,
     output_type: str | None = None,
-    **raw_kwargs: str,
+    **raw_kwargs: Any,
 ) -> Expression:
     """
     Creates a pydal Expression object representing a raw SQL fragment.

{typedal-3.17.0.dist-info → typedal-3.17.1.dist-info}/METADATA

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

{typedal-3.17.0.dist-info → typedal-3.17.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
-typedal/__about__.py,sha256=6xOJ9nMOnP3X9kALmHamZ6MhTwflJ564cHVnjqBINXg,207
+typedal/__about__.py,sha256=qAZyDEIwd6mDBYvr4cbjRjrTOK9zmsnsE0z1CgbpiGM,207
 typedal/__init__.py,sha256=mCU8C3xPYiGcai4PYIoZNJSkFa1jb0MHkV8s2XXqEeY,484
 typedal/caching.py,sha256=6YUzUMpan56nSy3D-Jl0FS-8V4LbTnpRSoDJHj6yPYo,11782
 typedal/cli.py,sha256=e08L8k6q1NGSzpKs7ywin0uwkK7Kz07I4REVjHdbyyE,19267
 typedal/config.py,sha256=0qy1zrTUdtmXPM9jHzFnSR1DJsqGJqcdG6pvhzKQHe0,11625
-typedal/core.py,sha256=eFcm3wyjydYpP3cEfoGz1jUVzaNBzRSoYSScYweZRmE,117701
+typedal/core.py,sha256=OfmymoVBUX72srUpRhs1870My-jPnPbjWDubdpMBbUU,117708
 typedal/fields.py,sha256=bZIgjl3Lj7eMqFCyt-bogsS_BqIs3cETEUH4W59qiXw,8425
 typedal/for_py4web.py,sha256=KIIu8XgnAfRQCJfZCra79k8SInOHiFuLDKUv3hzTJng,1908
 typedal/for_web2py.py,sha256=xn7zo6ImsmTkH6LacbjLQl2oqyBvP0zLqRxEJvMQk1w,1929
-typedal/helpers.py,sha256=eQjH3JpL1MPqMCcaFtj01tj0LxdwdT2zbnvKlDnXo5E,10702
+typedal/helpers.py,sha256=fvej53MqWG1n78-uTuxUEfLDpKrXJDOaIysogBFT3ns,11298
 typedal/mixins.py,sha256=NiGp-3Lr1lllWjP-whUhc_2HXwCS_ROB0bs5N_s9wk4,7976
 typedal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 typedal/types.py,sha256=1FIgv1s0be0E8r5Wd9E1nvDvK4ETV8u2NlfI7_P6UUY,6752
 typedal/web2py_py4web_shared.py,sha256=UYmD0_aK1bSVBt_f3j59Mxq-zOmQNkYkb8sPDUibq68,1539
 typedal/serializers/as_json.py,sha256=3JZlFhPrdvZVFAmH7P5DUAz8-TIk-br0F1CjKG3PFDM,2246
-typedal-3.17.0.dist-info/METADATA,sha256=SdNlSCbh3PyB8TUqVf_lE-x8r57BW4zUDijqcyLCR-w,10461
-typedal-3.17.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-typedal-3.17.0.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
-typedal-3.17.0.dist-info/RECORD,,
+typedal-3.17.1.dist-info/METADATA,sha256=d_6jgk1GPhrjkjP2XhqIDNN0bfI1cJ-GwohpNNby_Z8,10461
+typedal-3.17.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+typedal-3.17.1.dist-info/entry_points.txt,sha256=m1wqcc_10rHWPdlQ71zEkmJDADUAnZtn7Jac_6mbyUc,44
+typedal-3.17.1.dist-info/RECORD,,