Merge "pass more contextual information to PyWrapper param create" into main

2 files changed, 17 insertions, 7 deletions

diff --git a/lib/sqlalchemy/sql/coercions.py b/lib/sqlalchemy/sql/coercions.py
index 9c3e7480a..7a4e68773 100644
--- a/lib/sqlalchemy/sql/coercions.py
+++ b/lib/sqlalchemy/sql/coercions.py
@@ -355,7 +355,12 @@ def expect(
 
     if not isinstance(
         element,
-        (elements.CompilerElement, schema.SchemaItem, schema.FetchedValue),
+        (
+            elements.CompilerElement,
+            schema.SchemaItem,
+            schema.FetchedValue,
+            lambdas.PyWrapper,
+        ),
     ):
         resolved = None
 
@@ -404,6 +409,8 @@ def expect(
                     )
             else:
                 resolved = element
+    elif isinstance(element, lambdas.PyWrapper):
+        resolved = element._sa__py_wrapper_literal(**kw)
     else:
         resolved = element
 
diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py
index 26e3a21bb..d9b4988a6 100644
--- a/lib/sqlalchemy/sql/lambdas.py
+++ b/lib/sqlalchemy/sql/lambdas.py
@@ -33,7 +33,6 @@ from . import coercions
 from . import elements
 from . import roles
 from . import schema
-from . import type_api
 from . import visitors
 from .base import _clone
 from .base import Executable
@@ -1308,11 +1307,11 @@ class PyWrapper(ColumnOperators):
             return value
 
     def operate(self, op, *other, **kwargs):
-        elem = object.__getattribute__(self, "__clause_element__")()
+        elem = object.__getattribute__(self, "_py_wrapper_literal")()
         return op(elem, *other, **kwargs)
 
     def reverse_operate(self, op, other, **kwargs):
-        elem = object.__getattribute__(self, "__clause_element__")()
+        elem = object.__getattribute__(self, "_py_wrapper_literal")()
         return op(other, elem, **kwargs)
 
     def _extract_bound_parameters(self, starting_point, result_list):
@@ -1325,16 +1324,19 @@ class PyWrapper(ColumnOperators):
             element = getter(starting_point)
             pywrapper._sa__extract_bound_parameters(element, result_list)
 
-    def __clause_element__(self):
+    def _py_wrapper_literal(self, expr=None, operator=None, **kw):
         param = object.__getattribute__(self, "_param")
         to_evaluate = object.__getattribute__(self, "_to_evaluate")
         if param is None:
             name = object.__getattribute__(self, "_name")
             self._param = param = elements.BindParameter(
-                name, required=False, unique=True
+                name,
+                required=False,
+                unique=True,
+                _compared_to_operator=operator,
+                _compared_to_type=expr.type if expr is not None else None,
             )
             self._has_param = True
-            param.type = type_api._resolve_value_to_type(to_evaluate)
         return param._with_value(to_evaluate, maintain_key=True)
 
     def __bool__(self):
@@ -1348,6 +1350,7 @@ class PyWrapper(ColumnOperators):
             "__clause_element__",
             "operate",
             "reverse_operate",
+            "_py_wrapper_literal",
             "__class__",
             "__dict__",
         ):