Merge "accommodate for untracked boundparam lambda in offline_string"

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/sqlalchemy/sql/traversals.py b/lib/sqlalchemy/sql/traversals.py
index a86d16ef4..3d377271f 100644
--- a/lib/sqlalchemy/sql/traversals.py
+++ b/lib/sqlalchemy/sql/traversals.py
@@ -299,15 +299,15 @@ class CacheKey(namedtuple("CacheKey", ["key", "bindparams"])):
         else:
             sql_str = statement_cache[self.key]
 
-        return repr(
-            (
-                sql_str,
-                tuple(
-                    parameters.get(bindparam.key, bindparam.value)
-                    for bindparam in self.bindparams
-                ),
+        if not self.bindparams:
+            param_tuple = tuple(parameters[key] for key in sorted(parameters))
+        else:
+            param_tuple = tuple(
+                parameters.get(bindparam.key, bindparam.value)
+                for bindparam in self.bindparams
             )
-        )
+
+        return repr((sql_str, param_tuple))
 
     def __eq__(self, other):
         return self.key == other.key