Fix lambda statements with non-lambda criteria

diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py
index 38fa97b0e36297336bee645c2f21af9fa8e8bc27..6ec217e8f87c0e9636824091b8be4ca95f3ba917 100644 (file)
--- a/lib/sqlalchemy/sql/lambdas.py
+++ b/lib/sqlalchemy/sql/lambdas.py
@@ -314,7 +314,7 @@ class LambdaElement(elements.ClauseElement):
         return rec
 
     def __getattr__(self, key):
-        return getattr(self._rec.expected_expr, key)
+        return getattr(self._resolved, key)
 
     @property
     def _is_sequence(self):

diff --git a/test/sql/test_lambdas.py b/test/sql/test_lambdas.py
index 007f3e189ccc6568104ae0ac86c0eac86caf9fe3..e327bf979024a49d19d7852b5f8b1d8977db88f3 100644 (file)
--- a/test/sql/test_lambdas.py
+++ b/test/sql/test_lambdas.py
@@ -346,6 +346,34 @@ class LambdaElementTest(
         eq_(s2key[0], s4key[0])
         ne_(s1key[0], s2key[0])
 
+    def test_stmt_lambda_w_additional_non_lambda_and_closure_var(self):
+        def go(q):
+            stmt = lambdas.lambda_stmt(
+                lambda: select(column("x")).where(column("x") == q)
+            )
+            stmt = stmt.where(column("y") == column("z"))
+
+            return stmt
+
+        s1 = go(5)
+        s2 = go(10)
+
+        self.assert_compile(
+            s1,
+            "SELECT x WHERE x = :q_1 AND y = z",
+            checkparams={"q_1": 5},
+        )
+        self.assert_compile(
+            s2,
+            "SELECT x WHERE x = :q_1 AND y = z",
+            checkparams={"q_1": 10},
+        )
+
+        s1key = s1._generate_cache_key()
+        s2key = s2._generate_cache_key()
+
+        eq_(s1key[0], s2key[0])
+
     def test_stmt_lambda_w_atonce_whereclause_values_notrack(self):
         def go(col_expr, whereclause):
             stmt = lambdas.lambda_stmt(lambda: select(col_expr))