Skip to content

Fix: bug in model creation related to metadata-only statements #4836

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 1, 2025
Merged

Fix: bug in model creation related to metadata-only statements #4836

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
4 changes: 2 additions & 2 deletions sqlmesh/core/model/definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2431,7 +2431,7 @@ def _create_model(
if not issubclass(klass, SqlModel):
defaults.pop("optimize_query", None)

statements = []
statements: t.List[t.Union[exp.Expression, t.Tuple[exp.Expression, bool]]] = []

if "pre_statements" in kwargs:
statements.extend(kwargs["pre_statements"])
Expand All @@ -2453,7 +2453,7 @@ def _create_model(
statements.extend(property_values.expressions)

jinja_macro_references, used_variables = extract_macro_references_and_variables(
*(gen(e) for e in statements)
*(gen(e if isinstance(e, exp.Expression) else e[0]) for e in statements)
Copy link
Copy Markdown
Collaborator

@izeigerman izeigerman Jun 27, 2025

Choose a reason for hiding this comment

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

Are we sure this is a non-breaking change?

Copy link
Copy Markdown
Collaborator Author

@georgesittas georgesittas Jul 1, 2025

Choose a reason for hiding this comment

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

It should be fine, I think. These generated strings are used for extracting macro & variable references. If I'm not mistaken, we'd previously produce "(True, <expression SQL>)" due to reaching this section. After this PR we'll only search <expression SQL>.

)

if jinja_macros:
Expand Down