-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
Feature/model aliasing #771
Closed
Closed
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
…er/dbt into feature/model-aliasing
…o model-aliasing $ git merge kickstarter/feature/model-aliasing CONFLICT (content): Merge conflict in dbt/utils.py CONFLICT (modify/delete): dbt/include/global_project/macros/materializations/table.sql deleted in HEAD and modified in kickstarter/feature/model-aliasing. Version kickstarter/feature/model-aliasing of dbt/include/global_project/macros/materializations/table.sql left in tree. CONFLICT (modify/delete): dbt/include/global_project/macros/materializations/bigquery.sql deleted in HEAD and modified in kickstarter/feature/model-aliasing. Version kickstarter/feature/model-aliasing of dbt/include/global_project/macros/materializations/bigquery.sql left in tree. 1. dbt/utils.py Some major changes are being introduced in 0.10.1: Implement relations api (dbt-labs#727) dbt-labs#727 dbt-labs@5344f54#diff-196bbfafed32edaf1554550f65111f87 The Relation class was extracted into ... ./dbt/api/object.py class APIObject(dict) ./dbt/adapters/default/relation.py class DefaultRelation(APIObject) ./dbt/adapters/bigquery/relation.py class BigQueryRelation(DefaultRelation) ./dbt/adapters/snowflake/relation.py class SnowflakeRelation(DefaultRelation) Changing node.get('name') to node.get('alias') ... ./dbt/adapters/default/relation.py ./dbt/adapters/bigquery/relation.py ./dbt/adapters/snowflake/relation.py 2. dbt/include/global_project/macros/materializations/table.sql This was renamed to ... ./dbt/include/global_project/macros/materializations/table/table.sql 3. dbt/include/global_project/macros/materializations/bigquery.sql This was split into ... ./dbt/include/global_project/macros/materializations/table/bigquery_table.sql and ... ./dbt/include/global_project/macros/materializations/view/bigquery_view.sql 4. other instances of model['name'] The following file also mention model['name'] and probably need to change as well ... ./dbt/include/global_project/macros/materializations/archive/archive.sql ./dbt/include/global_project/macros/materializations/seed/bigquery.sql ./dbt/include/global_project/macros/materializations/seed/seed.sql Added comentary to ... ./dbt/exceptions.py 5. further changes Revert model.get('alias') to model.get('name') ... print_test_result_line in ./dbt/ui/printer.py (since in this context schema is NOT being used) Change model.get('name') to model.get('alias') ... print_seed_result_line in ./dbt/ui/printer.py (since in this context schema is also being used) Change node.get('name') to node.get('alias') ... _node_context in ./dbt/node_runners.py (since in this context schema is also being used) call_get_missing_columns in ./dbt/node_runners.py (since in this context schema is also being used) call_already_exists in ./dbt/node_runners.py (since in this context schema is also being used) 6. linting import lines must be under 80 characters https://www.python.org/dev/peps/pep-0328/
Merged
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.
I took @abelsonlive 's great PR #651 and merged it on top of the development branch, yesterday (i.e. 0.10.1rc2). I tried to address issues that popped up. While the unit and quick tests pass, I have not tested it against my snowflake databse yet.
$ git merge kickstarter/feature/model-aliasing
CONFLICT (content): Merge conflict in dbt/utils.py
CONFLICT (modify/delete): dbt/include/global_project/macros/materializations/table.sql deleted in HEAD and modified in kickstarter/feature/model-aliasing. Version kickstarter/feature/model-aliasing of dbt/include/global_project/macros/materializations/table.sql left in tree.
CONFLICT (modify/delete): dbt/include/global_project/macros/materializations/bigquery.sql deleted in HEAD and modified in kickstarter/feature/model-aliasing. Version kickstarter/feature/model-aliasing of dbt/include/global_project/macros/materializations/bigquery.sql left in tree.
dbt/utils.py
Some major changes are being introduced in 0.10.1: Implement relations api (Implement relations api #727)
Implement relations api #727
5344f54#diff-196bbfafed32edaf1554550f65111f87
The Relation class was extracted into ...
./dbt/api/object.py class APIObject(dict)
./dbt/adapters/default/relation.py class DefaultRelation(APIObject)
./dbt/adapters/bigquery/relation.py class BigQueryRelation(DefaultRelation)
./dbt/adapters/snowflake/relation.py class SnowflakeRelation(DefaultRelation)
Changing node.get('name') to node.get('alias') ...
./dbt/adapters/default/relation.py
./dbt/adapters/bigquery/relation.py
./dbt/adapters/snowflake/relation.py
dbt/include/global_project/macros/materializations/table.sql
This was renamed to ...
./dbt/include/global_project/macros/materializations/table/table.sql
dbt/include/global_project/macros/materializations/bigquery.sql
This was split into ...
./dbt/include/global_project/macros/materializations/table/bigquery_table.sql
and ...
./dbt/include/global_project/macros/materializations/view/bigquery_view.sql
other instances of model['name']
The following file also mention model['name'] and probably need to change as well ...
./dbt/include/global_project/macros/materializations/archive/archive.sql
./dbt/include/global_project/macros/materializations/seed/bigquery.sql
./dbt/include/global_project/macros/materializations/seed/seed.sql
Added comentary to ...
./dbt/exceptions.py
further changes
Revert model.get('alias') to model.get('name') ...
print_test_result_line in ./dbt/ui/printer.py (since in this context schema is NOT being used)
Change model.get('name') to model.get('alias') ...
print_seed_result_line in ./dbt/ui/printer.py (since in this context schema is also being used)
Change node.get('name') to node.get('alias') ...
_node_context in ./dbt/node_runners.py (since in this context schema is also being used)
call_get_missing_columns in ./dbt/node_runners.py (since in this context schema is also being used)
call_already_exists in ./dbt/node_runners.py (since in this context schema is also being used)
linting
import lines must be under 80 characters
https://www.python.org/dev/peps/pep-0328/