Fix: Make jinja_macros optional for environment statements#4072
Merged
themisvaltinos merged 2 commits intomainfrom Apr 2, 2025
Merged
Fix: Make jinja_macros optional for environment statements#4072themisvaltinos merged 2 commits intomainfrom
themisvaltinos merged 2 commits intomainfrom
Conversation
erindru
reviewed
Apr 2, 2025
sqlmesh/core/renderer.py
Outdated
| dialect, | ||
| [], | ||
| jinja_macro_registry=jinja_macros or JinjaMacroRegistry(), | ||
| jinja_macro_registry=jinja_macros or None, |
Collaborator
There was a problem hiding this comment.
This... seems suspect. Why did it need to change?
Contributor
Author
There was a problem hiding this comment.
it didn't need to change. I thought there was no need to carry an empty jinja macro registry dict for sqlmesh projects so only have it for the dbt projects that actually use them
Collaborator
There was a problem hiding this comment.
Ahh, thanks, I get it now.
But isnt jinja_macros or None the same as jinja_macros because the parameter is already defined as t.Optional[JinjaMacroRegistry] ?
Contributor
Author
There was a problem hiding this comment.
oh you're right. I should have had it like that from the beginning since this was already handled inside the Renderer
erindru
approved these changes
Apr 2, 2025
afzaljasani
pushed a commit
that referenced
this pull request
Apr 8, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make jinja_macros optional for environment statements to ensure they don't cause extra diffs when running plan in latest versions of pydantic ( > 2.10 ).