Overwrite clobber config fields #2062
Merged
+30
−1
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
5 tasks
drewbanin
force-pushed
the
fix/overwrite-clobber-config-fields
branch
from
5c5ae43 to
ec56d4f
Compare
beckjake
approved these changes
Jan 22, 2020
core/dbt/source_config.py
Outdated
| intermediary_merged = deep_merge( | ||
| merged_config.copy(), config.copy() | ||
| merged_config.copy(), config |
There was a problem hiding this comment.
This .copy() shouldn't be necessary, deep_merge calls deepcopy.
drewbanin
force-pushed
the
fix/overwrite-clobber-config-fields
branch
from
3e5e35d to
1f74980
Compare
drewbanin
commented
Jan 24, 2020
| @@ -50,9 +50,16 @@ def __init__(self, active_project, own_project, fqn, node_type): | |||
| def _merge(self, *configs): | |||
| merged_config = {} | |||
| for config in configs: | |||
| # Do not attempt to deep merge clobber fields | |||
There was a problem hiding this comment.
@beckjake I preserved the copy here since we pop elements out of the dict in the comprehension below. Can you give this another quick look?
Edit: also rebased this against dev/barbara-gittings
There was a problem hiding this comment.
Yes, I think that's the correct behavior
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.
Fixes #2049 by updating the Source Config class to overwrite, instead of deep merge, keys marked as "clobberable".