fix: macros resolution inside lambdas (#1849)

Author: tobymao

sqlmesh/core/macros.py

@@ -387,8 +387,12 @@ def substitute(
         node: exp.Expression, args: t.Dict[str, exp.Expression]
     ) -> exp.Expression | t.List[exp.Expression] | None:
         if isinstance(node, (exp.Identifier, exp.Var)):
-            if node.name in args and not isinstance(node.parent, exp.Column):
-                return args[node.name].copy()
+            if not isinstance(node.parent, exp.Column):
+                name = node.name
+                if name in args:
+                    return args[name].copy()
+                if name in evaluator.locals:
+                    return exp.convert(evaluator.locals[name])
             if SQLMESH_MACRO_PREFIX in node.name:
                 return node.__class__(
                     this=evaluator.template(node.name, {k: v.name for k, v in args.items()})

tests/core/test_macros.py

@@ -119,6 +119,11 @@ def test_ast_correctness(macro_evaluator):
 @pytest.mark.parametrize(
     "sql, expected, args",
     [
+        (
+            """select @each(['a', 'b'], x -> @x + @{x}_z + @y + @{y}_@{x})""",
+            "SELECT 'a' + a_z + 'c' + c_a, 'b' + b_z + 'c' + c_b",
+            {"y": "c"},
+        ),
         (
             '"is_@{x}"',
             '"is_b"',