Merge "Use explicit names for mapper _get_clause parameters"

3 files changed, 15 insertions, 6 deletions

diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index b26918f2f..29023c9fe 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -1400,14 +1400,14 @@ class BindParameter(roles.InElementRole, ColumnElement):
         else:
             self.type = type_
 
-    def _with_value(self, value, maintain_key=False):
+    def _with_value(self, value, maintain_key=False, required=NO_ARG):
         """Return a copy of this :class:`.BindParameter` with the given value
         set.
         """
         cloned = self._clone(maintain_key=maintain_key)
         cloned.value = value
         cloned.callable = None
-        cloned.required = False
+        cloned.required = required if required is not NO_ARG else self.required
         if cloned.type is type_api.NULLTYPE:
             cloned.type = type_api._resolve_value_to_type(value)
         return cloned
@@ -1826,7 +1826,7 @@ class TextClause(
                     replace_context=err,
                 )
             else:
-                new_params[key] = existing._with_value(value)
+                new_params[key] = existing._with_value(value, required=False)
 
     @util.preload_module("sqlalchemy.sql.selectable")
     def columns(self, *cols, **types):
diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py
index 2ffed2788..2b77b8743 100644
--- a/lib/sqlalchemy/sql/lambdas.py
+++ b/lib/sqlalchemy/sql/lambdas.py
@@ -1170,7 +1170,9 @@ class PyWrapper(ColumnOperators):
         to_evaluate = object.__getattribute__(self, "_to_evaluate")
         if param is None:
             name = object.__getattribute__(self, "_name")
-            self._param = param = elements.BindParameter(name, unique=True)
+            self._param = param = elements.BindParameter(
+                name, required=False, unique=True
+            )
             self._has_param = True
             param.type = type_api._resolve_value_to_type(to_evaluate)
         return param._with_value(to_evaluate, maintain_key=True)
diff --git a/lib/sqlalchemy/sql/traversals.py b/lib/sqlalchemy/sql/traversals.py
index 51a531000..3849749de 100644
--- a/lib/sqlalchemy/sql/traversals.py
+++ b/lib/sqlalchemy/sql/traversals.py
@@ -1370,12 +1370,19 @@ class TraversalComparatorStrategy(InternalTraversal, util.MemoizedSlots):
             return COMPARE_FAILED
 
     def compare_bindparam(self, left, right, **kw):
+        compare_keys = kw.pop("compare_keys", True)
         compare_values = kw.pop("compare_values", True)
+
         if compare_values:
-            return []
+            omit = []
         else:
             # this means, "skip these, we already compared"
-            return ["callable", "value"]
+            omit = ["callable", "value"]
+
+        if not compare_keys:
+            omit.append("key")
+
+        return omit
 
 
 class ColIdentityComparatorStrategy(TraversalComparatorStrategy):