Skip to content

Feat: correctly handle the generation of VALUES expressions using macros #4975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
georgesittas merged 1 commit into from
Jul 16, 2025
Merged

Feat: correctly handle the generation of VALUES expressions using macros #4975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions sqlmesh/core/dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,20 @@ def _parse_limit(
return macro


def _parse_value(self: Parser, values: bool = True) -> t.Optional[exp.Expression]:
wrapped = self._match(TokenType.L_PAREN, advance=False)

# The base _parse_value method always constructs a Tuple instance. This is problematic when
# generating values with a macro function, because it's impossible to tell whether the user's
# intention was to construct a row or a column with the VALUES expression. To avoid this, we
# amend the AST such that the Tuple is replaced by the macro function call itself.
expr = self.__parse_value() # type: ignore
if expr and not wrapped and isinstance(seq_get(expr.expressions, 0), MacroFunc):
Copy link
Contributor

@themisvaltinos themisvaltinos Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm. I imagine this preserves any other functionality and in this first position it should be each always this macro function?

Copy link
Contributor Author

@georgesittas georgesittas Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't have to be @EACH– other macro functions could also return lists. In that case, we should interpret the items in the list as either columns or rows depending on the presence of the parentheses after VALUES.

return expr.expressions[0]

return expr


def _parse_macro_or_clause(self: Parser, parser: t.Callable) -> t.Optional[exp.Expression]:
return _parse_macro(self) if self._match(TokenType.PARAMETER) else parser()

Expand Down Expand Up @@ -1063,6 +1077,7 @@ def extend_sqlglot() -> None:
_override(Parser, _parse_with)
_override(Parser, _parse_having)
_override(Parser, _parse_limit)
_override(Parser, _parse_value)
_override(Parser, _parse_lambda)
_override(Parser, _parse_types)
_override(Parser, _parse_if)
Expand Down
20 changes: 20 additions & 0 deletions tests/core/test_macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,26 @@ def test_ast_correctness(macro_evaluator):
"SELECT 3",
{},
),
(
"SELECT * FROM (VALUES @EACH([1, 2, 3], v -> (v)) ) AS v",
"SELECT * FROM (VALUES (1), (2), (3)) AS v",
{},
),
(
"SELECT * FROM (VALUES (@EACH([1, 2, 3], v -> (v))) ) AS v",
"SELECT * FROM (VALUES ((1), (2), (3))) AS v",
{},
),
(
"SELECT * FROM (VALUES @EACH([1, 2, 3], v -> (v, @EVAL(@v + 1))) ) AS v",
"SELECT * FROM (VALUES (1, 2), (2, 3), (3, 4)) AS v",
{},
),
(
"SELECT * FROM (VALUES (@EACH([1, 2, 3], v -> (v, @EVAL(@v + 1)))) ) AS v",
"SELECT * FROM (VALUES ((1, 2), (2, 3), (3, 4))) AS v",
{},
),
],
)
def test_macro_functions(macro_evaluator: MacroEvaluator, assert_exp_eq, sql, expected, args):
Expand Down