Merge pull request #183 from dbt-labs/fix/alt-multi-ref

fix multi ref tests - alt approach
dbt-labs · Aug 15, 2022 · 3ff7f50 · 3ff7f50
2 parents cbc788a + e681c59
commit 3ff7f50
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/integration_tests/models/staging/staging.yml b/integration_tests/models/staging/staging.yml
@@ -7,6 +7,9 @@ models:
         tests:
           - unique
           - not_null
+          - relationships:
+              to: ref('stg_model_2')
+              field: id
       - name: "concat(coalesce('fake_column', ' '),'for_testing')"
         tests:
           - not_null

diff --git a/integration_tests/seeds/tests/test_fct_test_coverage.csv b/integration_tests/seeds/tests/test_fct_test_coverage.csv
@@ -1,2 +1,2 @@
 total_models,total_tests,tested_models,test_coverage_pct,staging_test_coverage_pct,intermediate_test_coverage_pct,marts_test_coverage_pct,other_test_coverage_pct,test_to_model_ratio
-14,8,4,28.57,60.00,50.00,0.00,0.00,0.5714
+14,9,4,28.57,60.00,50.00,0.00,0.00,0.6429
diff --git a/macros/unpack/get_relationships.sql b/macros/unpack/get_relationships.sql
@@ -5,7 +5,6 @@
 {%- macro default__get_relationships(node_type) -%}
 
     {%- if execute -%}
-
         {%- if node_type == 'nodes' %}
             {% set nodes_list = graph.nodes.values() %}   
         {%- elif node_type == 'exposures' -%}
@@ -25,7 +24,8 @@
                 {%- set values_line = 
                   [
                     "cast('" ~ node.unique_id ~ "' as " ~ dbt_utils.type_string() ~ ")",
-                    "cast(NULL as " ~ dbt_utils.type_string() ~ ")"
+                    "cast(NULL as " ~ dbt_utils.type_string() ~ ")",
+                    "FALSE",
                   ] 
                 %}
 
@@ -38,7 +38,8 @@
                     {%- set values_line = 
                         [
                             "cast('" ~ node.unique_id ~ "' as " ~ dbt_utils.type_string() ~ ")",
-                            "cast('" ~ parent ~ "' as " ~ dbt_utils.type_string() ~ ")"
+                            "cast('" ~ parent ~ "' as " ~ dbt_utils.type_string() ~ ")",
+                            "" ~ loop.last ~ ""
                         ]
                     %}
 
@@ -55,7 +56,8 @@
             values = values,
             columns = [
                 'resource_id',
-                'direct_parent_id'
+                'direct_parent_id',
+                'is_primary_relationship'
             ]
          )
     ) }}

diff --git a/models/marts/core/int_direct_relationships.sql b/models/marts/core/int_direct_relationships.sql
@@ -18,35 +18,42 @@ all_graph_resources as (
 direct_model_relationships as (
     select  
         resource_id,
-        direct_parent_id
+        direct_parent_id,
+        is_primary_relationship
     from {{ ref('stg_node_relationships')}}
 ),
 
 direct_exposure_relationships as (
     select  
         resource_id,
-        direct_parent_id
+        direct_parent_id,
+        is_primary_relationship
     from {{ ref('stg_exposure_relationships')}}
 ),
 
 direct_metrics_relationships as (
     select  
         resource_id,
-        direct_parent_id
+        direct_parent_id,
+        is_primary_relationship
     from {{ ref('stg_metric_relationships')}}
 ),
 
 -- for all resources in the graph, find their direct parent
 direct_relationships as (
     select
         all_graph_resources.*,
-        CASE 
-            WHEN all_graph_resources.resource_type = 'source' THEN NULL
-            WHEN all_graph_resources.resource_type = 'exposure' THEN exposures.direct_parent_id
-            WHEN all_graph_resources.resource_type = 'metric' THEN metrics.direct_parent_id
-            WHEN all_graph_resources.resource_type IN ('model', 'snapshot', 'test') THEN models.direct_parent_id
-            ELSE NULL
-        END AS direct_parent_id
+        case 
+            when all_graph_resources.resource_type = 'source' then null
+            when all_graph_resources.resource_type = 'exposure' then exposures.direct_parent_id
+            when all_graph_resources.resource_type = 'metric' then metrics.direct_parent_id
+            when all_graph_resources.resource_type in ('model', 'snapshot', 'test') then models.direct_parent_id
+            else null
+        end as direct_parent_id,
+        (
+            all_graph_resources.resource_type = 'test'
+            and models.is_primary_relationship
+        ) as is_primary_test_relationship
     from all_graph_resources
     left join direct_model_relationships as models
         on all_graph_resources.resource_id = models.resource_id

diff --git a/models/marts/structure/fct_test_directories.sql b/models/marts/structure/fct_test_directories.sql
@@ -21,6 +21,7 @@ models_per_test as (
         direct_parent_id as parent_model_id
     from relationships
     where resource_type = 'test'
+    and is_primary_test_relationship
 
 ),
 

diff --git a/models/marts/tests/intermediate/int_model_test_summary.sql b/models/marts/tests/intermediate/int_model_test_summary.sql
@@ -19,6 +19,7 @@ count_column_tests as (
     left join relationships
         on all_graph_resources.resource_id = relationships.resource_id
     where all_graph_resources.resource_type = 'test'
+    and relationships.is_primary_test_relationship
     group by 1,2
 ),