TypeDAL 3.17.0__tar.gz → 3.17.1__tar.gz

{typedal-3.17.0 → typedal-3.17.1}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.17.1 (2025-09-20)
+
+### Fix
+
+* Smarter adapt so Fields and Tables can also be safely inserted in `sql_expression` ([`d5cad6a`](https://github.com/trialandsuccess/TypeDAL/commit/d5cad6a13ddf50ec6e5762075fbeae1e44067da6))
+
 ## v3.17.0 (2025-09-20)
 
 ### Feature

{typedal-3.17.0 → typedal-3.17.1}/PKG-INFO

@@ -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 → typedal-3.17.1}/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.17.0"
+__version__ = "3.17.1"

{typedal-3.17.0 → typedal-3.17.1}/src/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-3.17.0 → typedal-3.17.1}/src/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 → typedal-3.17.1}/tests/test_helpers.py

@@ -223,7 +223,7 @@ def test_sql_expression():
     expr1 = sql_expression(database, "date('now') > %s", "2025-01-01")
     expr2 = database.sql_expression("date('now') > %(value)s", value="2025-01-01")
 
-    assert expr1 == expr2
+    assert str(expr1) == str(expr2)
     assert str(expr1) == "date('now') > '2025-01-01'"
     # past -> should yield result
     result = database(expr1).select(TestSqlExpression.value, expr2)[0]
@@ -240,3 +240,7 @@ def test_sql_expression():
     # far future -> should not yield result
     result3 = database(expr3).select(TestSqlExpression.value, expr3).as_list()
     assert not result3
+
+    # test quoting fields and tables:
+    assert str(database.sql_expression("LOWER(%s)", TestSqlExpression.value)) == 'LOWER("test_sql_expression"."value")'
+    assert str(database.sql_expression("LOWER(%s.value)", TestSqlExpression)) == 'LOWER("test_sql_expression".value)'