Remove injected_sql. Store non-ephemeral injected_sql in compiled_sql #2834
Conversation
This file contains 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
4 tasks
gshank
force-pushed
the
feature/remove_injected_sql
branch
4 times, most recently
from
2339c5b
to
8be9825
Compare
gshank
force-pushed
the
feature/remove_injected_sql
branch
from
8be9825
to
512c41d
Compare
jtcohen6
approved these changes
Oct 16, 2020
There was a problem hiding this comment.
I took this for a spin locally and tried a bunch of hacky things with ephemeral models and dynamic templating (via run_query). The compiled_sql in the manifest looks good every time.
Really happy to see all the code comments in compilation.py! I can actually follow what's happening.
After we merge this and before a v0.19 prerelease, we'll want to merge the corresponding dbt-docs PR: dbt-labs/dbt-docs#148
| self.assertGreaterEqual(result[1].replace(tzinfo=pytz.UTC), self._invalidated_snapshot_datetime) | ||
| # there are milliseconds (part of microseconds in datetime objects) in the | ||
| # invalidated_snapshot_datetime and not in result datetime so set the microseconds to 0 | ||
| self.assertGreaterEqual(result[1].replace(tzinfo=pytz.UTC), self._invalidated_snapshot_datetime.replace(microsecond=0)) |
kwigley
approved these changes
Oct 19, 2020
1 task
5 tasks
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.
resolves #2762
Description
The 'injected_sql' field in the manifest nodes is confusing, since it's another form of compiled_sql. The injected_sql field is used internally in compiling ephemeral nodes. This code removed injected_sql from the classes and artifacts, and copies it into 'compiled_sql' for executable nodes. Ephemeral nodes will retain their original 'compiled_sql', since it didn't work to overwrite compiled_sql with injected_sql for those nodes. Since ephemeral nodes do not show up in executable SQL files, this will not hopefully be an issue.
Checklist
CHANGELOG.mdand added information about my change to the "dbt next" section.