Merge pull request #2837 from franloza/feature/2647-relation-name-in-…

…metadata

Store relation name in manifest's node and source objects

CHANGELOG.md

@@ -34,6 +34,7 @@ Contributors:
 - Save cli and rpc arguments in run_results.json ([#2510](https://github.com/fishtown-analytics/dbt/issues/2510), [#2813](https://github.com/fishtown-analytics/dbt/pull/2813))
 - Added support for BigQuery connections using refresh tokens ([#2344](https://github.com/fishtown-analytics/dbt/issues/2344), [#2805](https://github.com/fishtown-analytics/dbt/pull/2805))
 - Remove injected_sql from manifest nodes ([#2762](https://github.com/fishtown-analytics/dbt/issues/2762), [#2834](https://github.com/fishtown-analytics/dbt/pull/2834))
+- Store resolved node names in manifest ([#2647](https://github.com/fishtown-analytics/dbt/issues/2647), [#2837](https://github.com/fishtown-analytics/dbt/pull/2837))
 
 ### Under the hood
 - Added strategy-specific validation to improve the relevancy of compilation errors for the `timestamp` and `check` snapshot strategies. (([#2787](https://github.com/fishtown-analytics/dbt/issues/2787), [#2791](https://github.com/fishtown-analytics/dbt/pull/2791))
@@ -51,6 +52,7 @@ Contributors:
 - [@zmac12](https://github.com/zmac12) ([#2817](https://github.com/fishtown-analytics/dbt/pull/2817))
 - [@Mr-Nobody99](https://github.com/Mr-Nobody99) ([docs#138](https://github.com/fishtown-analytics/dbt-docs/pull/138))
 - [@jplynch77](https://github.com/jplynch77) ([docs#139](https://github.com/fishtown-analytics/dbt-docs/pull/139))
+- [@franloza](https://github.com/franloza) ([#2837](https://github.com/fishtown-analytics/dbt/pull/2837))
 
 ## dbt 0.18.1 (October 13, 2020)
 

core/dbt/compilation.py

@@ -172,6 +172,15 @@ def add_ephemeral_prefix(self, name: str):
         relation_cls = adapter.Relation
         return relation_cls.add_ephemeral_prefix(name)
 
+    def _get_relation_name(self, node: ParsedNode):
+        relation_name = None
+        if (node.resource_type in NodeType.refable() and
+                not node.is_ephemeral_model):
+            adapter = get_adapter(self.config)
+            relation_cls = adapter.Relation
+            relation_name = str(relation_cls.create_from(self.config, node))
+        return relation_name
+
     def _inject_ctes_into_sql(self, sql: str, ctes: List[InjectedCTE]) -> str:
         """
         `ctes` is a list of InjectedCTEs like:
@@ -395,6 +404,8 @@ def _compile_node(
             node,
         )
 
+        compiled_node.relation_name = self._get_relation_name(node)
+
         compiled_node.compiled = True
 
         # add ctes for specific test nodes, and also for

core/dbt/contracts/graph/compiled.py

@@ -42,6 +42,7 @@ class CompiledNode(ParsedNode, CompiledNodeMixin):
     compiled_sql: Optional[str] = None
     extra_ctes_injected: bool = False
     extra_ctes: List[InjectedCTE] = field(default_factory=list)
+    relation_name: Optional[str] = None
 
     def set_cte(self, cte_id: str, sql: str):
         """This is the equivalent of what self.extra_ctes[cte_id] = sql would

core/dbt/contracts/graph/parsed.py

@@ -555,6 +555,7 @@ class ParsedSourceDefinition(
     config: SourceConfig = field(default_factory=SourceConfig)
     patch_path: Optional[Path] = None
     unrendered_config: Dict[str, Any] = field(default_factory=dict)
+    relation_name: Optional[str] = None
 
     def same_database_representation(
         self, other: 'ParsedSourceDefinition'

core/dbt/parser/schemas.py

@@ -264,6 +264,11 @@ def _generate_source_config(self, fqn: List[str], rendered: bool):
             base=False,
         )
 
+    def _get_relation_name(self, node: ParsedSourceDefinition):
+        adapter = get_adapter(self.root_project)
+        relation_cls = adapter.Relation
+        return str(relation_cls.create_from(self.root_project, node))
+
     def parse_source(
         self, target: UnpatchedSourceDefinition
     ) -> ParsedSourceDefinition:
@@ -302,7 +307,7 @@ def parse_source(
 
         default_database = self.root_project.credentials.database
 
-        return ParsedSourceDefinition(
+        parsed_source = ParsedSourceDefinition(
             package_name=target.package_name,
             database=(source.database or default_database),
             schema=(source.schema or source.name),
@@ -330,6 +335,11 @@ def parse_source(
             unrendered_config=unrendered_config,
         )
 
+        # relation name is added after instantiation because the adapter does
+        # not provide the relation name for a UnpatchedSourceDefinition object
+        parsed_source.relation_name = self._get_relation_name(parsed_source)
+        return parsed_source
+
     def create_test_node(
         self,
         target: Union[UnpatchedSourceDefinition, UnparsedNodeUpdate],

test/integration/029_docs_generate_tests/snapshot/snapshot_seed.sql

@@ -0,0 +1,11 @@
+{% snapshot snapshot_seed %}
+{{
+    config(
+      unique_key='id',
+      strategy='check',
+      check_cols='all',
+      target_schema=var('alternate_schema')
+    )
+}}
+select * from {{ ref('seed') }}
+{% endsnapshot %}