Skip to content

Fix: Handle macros in model properties when formatting #4144

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
themisvaltinos merged 2 commits into from
Apr 15, 2025
Merged

Fix: Handle macros in model properties when formatting #4144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1313205
Fix: Handle macros in model properties when formatting
themisvaltinos Apr 15, 2025
1661fc8
refactor
themisvaltinos Apr 15, 2025
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
5 changes: 4 additions & 1 deletion sqlmesh/core/dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,10 @@ def _props_sql(self: Generator, expressions: t.List[exp.Expression]) -> str:
size = len(expressions)

for i, prop in enumerate(expressions):
sql = self.indent(f"{prop.name} {self.sql(prop, 'value')}")
if isinstance(prop, MacroFunc):
sql = self.indent(self.sql(prop, comment=False))
else:
sql = self.indent(f"{prop.name} {self.sql(prop, 'value')}")

if i < size - 1:
sql += ","
Expand Down
8 changes: 6 additions & 2 deletions tests/core/test_dialect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def test_format_model_expressions():
a,
(b, c) as d,
), -- c
@macro_prop_with_comment(proper := 'foo'), -- k
audits [
not_null(columns=[
foo_id,
Expand Down Expand Up @@ -91,6 +92,7 @@ def test_format_model_expressions():
name a.b, /* a */
kind FULL, /* b */
references (a, (b, c) AS d), /* c */
@macro_prop_with_comment(proper := 'foo'), /* k */
audits ARRAY(
NOT_NULL(
columns = ARRAY(
Expand Down Expand Up @@ -269,7 +271,7 @@ def test_format_body_macros():
format_model_expressions(
parse(
"""
Model ( name foo );
Model ( name foo , @macro_dialect(), @properties_macro(prop_1 := 'max', prop_2 := 33));
@WITH(TRUE) x AS (SELECT 1)
SELECT col::int
FROM foo
Expand All @@ -281,7 +283,9 @@ def test_format_body_macros():
)
)
== """MODEL (
name foo
name foo,
@macro_dialect(),
@properties_macro(prop_1 := 'max', prop_2 := 33)
);

@WITH(TRUE) x AS (
Expand Down