fix: prioritize @each lambda params over column name conflicts (#5769)

Signed-off-by: Mubin Umarov <mubin.umarov@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: MubinUmarov

sqlmesh/core/macros.py

@@ -648,10 +648,10 @@ def substitute(
         node: exp.Expr, args: t.Dict[str, exp.Expr]
     ) -> exp.Expr | t.List[exp.Expr] | None:
         if isinstance(node, (exp.Identifier, exp.Var)):
+            name = node.name.lower()
+            if name in args:
+                return args[name].copy()
             if not isinstance(node.parent, exp.Column):
-                name = node.name.lower()
-                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:

tests/core/test_macros.py

@@ -618,6 +618,20 @@ def test_ast_correctness(macro_evaluator):
             "SELECT * FROM (VALUES ((1, 2), (2, 3), (3, 4))) AS v",
             {},
         ),
+        # Lambda parameter name matches the column identifier inside a Column expression
+        # (e.g. schema.product where 'product' is both the lambda arg and the column name).
+        # Lambda args must take precedence over the Column-context guard so that the param
+        # is substituted correctly (regression test for GitHub issue #5582).
+        (
+            "SELECT @EACH([a, b, c], product -> schema.product)",
+            "SELECT schema.a, schema.b, schema.c",
+            {},
+        ),
+        (
+            "SELECT @EACH([x, y], col -> tbl.col)",
+            "SELECT tbl.x, tbl.y",
+            {},
+        ),
     ],
 )
 def test_macro_functions(macro_evaluator: MacroEvaluator, assert_exp_eq, sql, expected, args):