Merge "Use explicit names for mapper _get_clause parameters"

3 files changed, 15 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 24751bf1d..4a90caeff 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -436,6 +436,14 @@ def load_on_pk_identity(
                 lambda q: q.where(
                     sql_util._deep_annotate(_get_clause, {"_orm_adapt": True})
                 ),
+                # this track_on will allow the lambda to refresh if
+                # _get_clause goes stale due to reconfigured mapper.
+                # however, it's not needed as the lambda otherwise tracks
+                # on the SQL cache key of the expression.  the main thing
+                # is that the bindparam.key stays the same if the cache key
+                # stays the same, as we are referring to the .key explicitly
+                # in the params.
+                # track_on=[id(_get_clause)]
             )
         else:
             q._where_criteria = (
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index fe425301a..93f4c87a1 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -2569,8 +2569,11 @@ class Mapper(
 
         """
         params = [
-            (primary_key, sql.bindparam(None, type_=primary_key.type))
-            for primary_key in self.primary_key
+            (
+                primary_key,
+                sql.bindparam("pk_%d" % idx, type_=primary_key.type),
+            )
+            for idx, primary_key in enumerate(self.primary_key, 1)
         ]
         return (
             sql.and_(*[k == v for (k, v) in params]),
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 51f75baf3..339a5bcf1 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -672,6 +672,7 @@ class LazyLoader(AbstractRelationshipLoader, util.MemoizedSlots):
             and self.entity._get_clause[0].compare(
                 self._lazywhere,
                 use_proxies=True,
+                compare_keys=False,
                 equivalents=self.mapper._equivalent_columns,
             )
         )
@@ -2535,6 +2536,7 @@ class SelectInLoader(PostLoader, util.MemoizedSlots):
                 self.omit_join = self.parent._get_clause[0].compare(
                     lazyloader._rev_lazywhere,
                     use_proxies=True,
+                    compare_keys=False,
                     equivalents=self.parent._equivalent_columns,
                 )