add generic test to macro_edges

dbt-labs · Oct 21, 2021 · 31c142c · 31c142c
1 parent 787aef9
commit 31c142c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/core/dbt/contracts/graph/manifest.py b/core/dbt/contracts/graph/manifest.py
@@ -291,10 +291,13 @@ def build_node_edges(nodes: List[ManifestNode]):
     return _sort_values(forward_edges), _sort_values(backward_edges)
 
 
-# Build a map of children of macros
+# Build a map of children of macros and generic tests
 def build_macro_edges(nodes: List[Any]):
     forward_edges: Dict[str, List[str]] = {
-        n.unique_id: [] for n in nodes if n.unique_id.startswith('macro') or n.depends_on.macros
+        n.unique_id: [] for n in nodes
+        if (n.unique_id.startswith('macro') or
+            n.unique_id.startswith('test') or
+            n.depends_on.macros)
     }
     for node in nodes:
         for unique_id in node.depends_on.macros:

diff --git a/core/dbt/contracts/graph/unparsed.py b/core/dbt/contracts/graph/unparsed.py
@@ -46,7 +46,6 @@ class UnparsedMacro(UnparsedBaseNode, HasSQL):
 
 @dataclass
 class UnparsedGenericTest(UnparsedBaseNode, HasSQL):
-    # TODO: should this be nodeType macro?
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Macro]})
 
 

diff --git a/core/dbt/parser/generic_test.py b/core/dbt/parser/generic_test.py
@@ -12,7 +12,7 @@
 from dbt.node_types import NodeType
 from dbt.parser.base import BaseParser
 from dbt.parser.search import FileBlock
-from dbt.utils import MACRO_PREFIX  # TODO: should this be macro?
+from dbt.utils import MACRO_PREFIX
 
 
 class GenericTestParser(BaseParser[ParsedGenericTestNode]):
@@ -47,9 +47,11 @@ def parse_unparsed_generic_test(
         try:
             blocks: List[jinja.BlockTag] = [
                 t for t in
-                jinja.extract_toplevel_blocks(base_node.raw_sql,
-                                              allowed_blocks={'test'},
-                                              collect_raw_data=False,)
+                jinja.extract_toplevel_blocks(
+                    base_node.raw_sql,
+                    allowed_blocks={'test'},
+                    collect_raw_data=False,
+                )
                 if isinstance(t, jinja.BlockTag)
             ]
         except CompilationException as exc:
@@ -91,7 +93,6 @@ def parse_file(self, block: FileBlock):
         logger.debug("Parsing {}".format(original_file_path))
 
         # this is really only used for error messages
-
         base_node = UnparsedMacro(
             path=original_file_path,
             original_file_path=original_file_path,