Merge pull request #350 from dbt-labs/fix/exceptions-generate-alias-name

b-per · web-flow · commit 638f3ac534c5 · 2023-06-08T17:56:01.000+02:00
🐛 Fix exceptions, by reading `model.name`
diff --git a/macros/filter_exceptions.sql b/macros/filter_exceptions.sql
@@ -1,15 +1,15 @@
-{% macro filter_exceptions(model_ref) -%}
-    {{ return(adapter.dispatch('filter_exceptions', 'dbt_project_evaluator')(model_ref)) }}
+{% macro filter_exceptions(model_name) -%}
+    {{ return(adapter.dispatch('filter_exceptions', 'dbt_project_evaluator')(model_name)) }}
 {%- endmacro %}
 
-{% macro default__filter_exceptions(model_ref) %}
+{% macro default__filter_exceptions(model_name) %}
 
     {% set query_filters %}
     select
         column_name,
         id_to_exclude
     from {{ ref('dbt_project_evaluator_exceptions') }}
-    where fct_name = '{{ model_ref.name }}'
+    where fct_name = '{{ model_name }}'
     {% endset %}
 
     {% if execute %}
diff --git a/models/marts/dag/fct_direct_join_to_source.sql b/models/marts/dag/fct_direct_join_to_source.sql
@@ -37,4 +37,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_hard_coded_references.sql b/models/marts/dag/fct_hard_coded_references.sql
@@ -16,4 +16,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_marts_or_intermediate_dependent_on_source.sql b/models/marts/dag/fct_marts_or_intermediate_dependent_on_source.sql
@@ -19,4 +19,4 @@ final as (
 )
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_model_fanout.sql b/models/marts/dag/fct_model_fanout.sql
@@ -48,4 +48,4 @@ model_fanout_agg as (
 
 select * from model_fanout_agg
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_multiple_sources_joined.sql b/models/marts/dag/fct_multiple_sources_joined.sql
@@ -27,4 +27,4 @@ multiple_sources_joined as (
 
 select * from multiple_sources_joined
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_rejoining_of_upstream_concepts.sql b/models/marts/dag/fct_rejoining_of_upstream_concepts.sql
@@ -66,4 +66,4 @@ final_filtered as (
 
 select * from final_filtered
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_root_models.sql b/models/marts/dag/fct_root_models.sql
@@ -20,4 +20,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_source_fanout.sql b/models/marts/dag/fct_source_fanout.sql
@@ -27,4 +27,4 @@ source_fanout as (
 
 select * from source_fanout
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_staging_dependent_on_marts_or_intermediate.sql b/models/marts/dag/fct_staging_dependent_on_marts_or_intermediate.sql
@@ -22,4 +22,4 @@ final as (
 )
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_staging_dependent_on_staging.sql b/models/marts/dag/fct_staging_dependent_on_staging.sql
@@ -23,4 +23,4 @@ bending_connections as (
 
 select * from bending_connections
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/dag/fct_unused_sources.sql b/models/marts/dag/fct_unused_sources.sql
@@ -19,4 +19,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/documentation/fct_undocumented_models.sql b/models/marts/documentation/fct_undocumented_models.sql
@@ -19,4 +19,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/performance/fct_chained_views_dependencies.sql b/models/marts/performance/fct_chained_views_dependencies.sql
@@ -20,6 +20,6 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
 
 order by distance desc
diff --git a/models/marts/performance/fct_exposure_parents_materializations.sql b/models/marts/performance/fct_exposure_parents_materializations.sql
@@ -31,4 +31,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/structure/fct_model_directories.sql b/models/marts/structure/fct_model_directories.sql
@@ -66,6 +66,6 @@ unioned as (
 
 select * from unioned
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
  
 
diff --git a/models/marts/structure/fct_model_naming_conventions.sql b/models/marts/structure/fct_model_naming_conventions.sql
@@ -52,4 +52,4 @@ inappropriate_model_names as (
 
 select * from inappropriate_model_names
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/structure/fct_source_directories.sql b/models/marts/structure/fct_source_directories.sql
@@ -23,4 +23,4 @@ inappropriate_subdirectories_sources as (
 
 select * from inappropriate_subdirectories_sources
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/structure/fct_test_directories.sql b/models/marts/structure/fct_test_directories.sql
@@ -85,4 +85,4 @@ different_directories as (
 
 select * from different_directories
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}
diff --git a/models/marts/tests/fct_missing_primary_key_tests.sql b/models/marts/tests/fct_missing_primary_key_tests.sql
@@ -1,3 +1,9 @@
+{{
+  config(
+    alias = 'my_alias',
+    )
+}}
+
 with 
 
 tests as (
@@ -15,4 +21,4 @@ final as (
 
 select * from final
 
-{{ filter_exceptions(this) }}
+{{ filter_exceptions(model.name) }}

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ final as (`
`37`	`37`
`38`	`38`	`select * from final`
`39`	`39`
`40`		`-{{ filter_exceptions(this) }}`
	`40`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@ final as (`
`16`	`16`
`17`	`17`	`select * from final`
`18`	`18`
`19`		`-{{ filter_exceptions(this) }}`
	`19`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ final as (`
`19`	`19`	`)`
`20`	`20`	`select * from final`
`21`	`21`
`22`		`-{{ filter_exceptions(this) }}`
	`22`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@ model_fanout_agg as (`
`48`	`48`
`49`	`49`	`select * from model_fanout_agg`
`50`	`50`
`51`		`-{{ filter_exceptions(this) }}`
	`51`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ multiple_sources_joined as (`
`27`	`27`
`28`	`28`	`select * from multiple_sources_joined`
`29`	`29`
`30`		`-{{ filter_exceptions(this) }}`
	`30`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,4 @@ final_filtered as (`
`66`	`66`
`67`	`67`	`select * from final_filtered`
`68`	`68`
`69`		`-{{ filter_exceptions(this) }}`
	`69`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ final as (`
`20`	`20`
`21`	`21`	`select * from final`
`22`	`22`
`23`		`-{{ filter_exceptions(this) }}`
	`23`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ source_fanout as (`
`27`	`27`
`28`	`28`	`select * from source_fanout`
`29`	`29`
`30`		`-{{ filter_exceptions(this) }}`
	`30`	`+{{ filter_exceptions(model.name) }}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@ final as (`
`22`	`22`	`)`
`23`	`23`	`select * from final`
`24`	`24`
`25`		`-{{ filter_exceptions(this) }}`
	`25`	`+{{ filter_exceptions(model.name) }}`