debug

Author: abondar

tortoise/contrib/postgres/regex.py

@@ -4,7 +4,7 @@
 from typing import cast
 
 from pypika_tortoise.enums import SqlTypes
-from pypika_tortoise.functions import Cast, Coalesce
+from pypika_tortoise.functions import Cast
 from pypika_tortoise.terms import BasicCriterion, Term
 
 
@@ -15,13 +15,9 @@ class PostgresRegexMatching(enum.Enum):
 
 def postgres_posix_regex(field: Term, value: str):
     term = cast(Term, field.wrap_constant(value))
-    return BasicCriterion(
-        PostgresRegexMatching.POSIX_REGEX, Coalesce(Cast(field, SqlTypes.VARCHAR), ""), term
-    )
+    return BasicCriterion(PostgresRegexMatching.POSIX_REGEX, Cast(field, SqlTypes.VARCHAR), term)
 
 
 def postgres_insensitive_posix_regex(field: Term, value: str):
     term = cast(Term, field.wrap_constant(value))
-    return BasicCriterion(
-        PostgresRegexMatching.IPOSIX_REGEX, Coalesce(Cast(field, SqlTypes.VARCHAR), ""), term
-    )
+    return BasicCriterion(PostgresRegexMatching.IPOSIX_REGEX, Cast(field, SqlTypes.VARCHAR), term)

tortoise/contrib/sqlite/regex.py

@@ -6,7 +6,7 @@
 
 import aiosqlite
 from pypika_tortoise.enums import SqlTypes
-from pypika_tortoise.functions import Cast, Coalesce
+from pypika_tortoise.functions import Cast
 from pypika_tortoise.terms import BasicCriterion, Term
 
 
@@ -17,16 +17,12 @@ class SQLiteRegexMatching(enum.Enum):
 
 def posix_sqlite_regexp(field: Term, value: str):
     term = cast(Term, field.wrap_constant(value))
-    return BasicCriterion(
-        SQLiteRegexMatching.POSIX_REGEX, Coalesce(Cast(field, SqlTypes.VARCHAR), ""), term
-    )
+    return BasicCriterion(SQLiteRegexMatching.POSIX_REGEX, Cast(field, SqlTypes.VARCHAR), term)
 
 
 def insensitive_posix_sqlite_regexp(field: Term, value: str):
     term = cast(Term, field.wrap_constant(value))
-    return BasicCriterion(
-        SQLiteRegexMatching.IPOSIX_REGEX, Coalesce(Cast(field, SqlTypes.VARCHAR), ""), term
-    )
+    return BasicCriterion(SQLiteRegexMatching.IPOSIX_REGEX, Cast(field, SqlTypes.VARCHAR), term)
 
 
 async def install_regexp_functions(connection: aiosqlite.Connection):

tortoise/expressions.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import numbers
 import operator
 from dataclasses import dataclass
 from dataclasses import field as dataclass_field
@@ -95,6 +96,20 @@ def resolve(self, resolve_context: ResolveContext) -> ResolveResult:
         right = self.right.resolve(resolve_context)
         left_output_field, right_output_field = left.output_field, right.output_field  # type: ignore
 
+        def _inline_numeric_constants(term: Term) -> Term:
+            if isinstance(term, ValueWrapper) and isinstance(term.value, numbers.Real):
+                if isinstance(term.value, bool):
+                    return term
+                return ValueWrapper(term.value, allow_parametrize=False)
+            return term
+
+        if resolve_context.model._meta.db.capabilities.dialect == "postgres":
+            left_term = _inline_numeric_constants(left.term)
+            right_term = _inline_numeric_constants(right.term)
+        else:
+            left_term = left.term
+            right_term = right.term
+
         if (
             left_output_field
             and right_output_field
@@ -104,7 +119,7 @@ def resolve(self, resolve_context: ResolveContext) -> ResolveResult:
 
         operator_func = getattr(operator, self.connector.value)
         return ResolveResult(
-            term=operator_func(left.term, right.term),
+            term=operator_func(left_term, right_term),
             joins=list(set(left.joins + right.joins)),  # dedup joins
             output_field=right_output_field or left_output_field,
         )