Skip to content

Fix!: dont wrap macro vars and str replacements in intervals #4073

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
Apr 2, 2025
Merged

Fix!: dont wrap macro vars and str replacements in intervals #4073

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
6 changes: 6 additions & 0 deletions sqlmesh/core/dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,12 @@ def extend_sqlglot() -> None:
MacroDef,
)

generator.UNWRAPPED_INTERVAL_VALUES = (
*generator.UNWRAPPED_INTERVAL_VALUES,
MacroStrReplace,
MacroVar,
)

_override(Parser, _parse_select)
_override(Parser, _parse_statement)
_override(Parser, _parse_join)
Expand Down
2 changes: 2 additions & 0 deletions tests/core/test_dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ def test_format_model_expressions():

def test_macro_format():
assert parse_one("@EACH(ARRAY(1,2), x -> x)").sql() == "@EACH(ARRAY(1, 2), x -> x)"
assert parse_one("INTERVAL @x DAY").sql() == "INTERVAL @x DAY"
assert parse_one("INTERVAL @'@{bar}' DAY").sql() == "INTERVAL @'@{bar}' DAY"


def test_format_body_macros():
Expand Down