Skip to content

Commit

Permalink
Merge branch 'main' into log-own-custom-rules
Browse files Browse the repository at this point in the history
  • Loading branch information
graciegoheen authored Feb 1, 2024
2 parents b7c8d10 + 7987ee8 commit 11f8fda
Show file tree
Hide file tree
Showing 25 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions macros/filter_exceptions.sql
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% macro filter_exceptions(model_name) -%}
{{ return(adapter.dispatch('filter_exceptions', 'dbt_project_evaluator')(model_name)) }}
{% macro filter_exceptions() -%}
{{ return(adapter.dispatch('filter_exceptions', 'dbt_project_evaluator')()) }}
{%- endmacro %}

{% macro default__filter_exceptions(model_name) %}
{% macro default__filter_exceptions() %}

{% set query_filters %}
select
column_name,
id_to_exclude
from {{ ref('dbt_project_evaluator_exceptions') }}
where fct_name = '{{ model_name }}'
where fct_name = '{{ model.name }}'
{% endset %}

{% if execute %}
Expand Down
2 changes: 1 addition & 1 deletion models/marts/dag/fct_direct_join_to_source.sql
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_hard_coded_references.sql
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ final as (
)
select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_model_fanout.sql
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ model_fanout_agg as (

select * from model_fanout_agg

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_multiple_sources_joined.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ multiple_sources_joined as (

select * from multiple_sources_joined

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_rejoining_of_upstream_concepts.sql
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ final_filtered as (

select * from final_filtered

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_root_models.sql
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_source_fanout.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ source_fanout as (

select * from source_fanout

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ final as (
)
select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_staging_dependent_on_staging.sql
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ bending_connections as (

select * from bending_connections

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/dag/fct_unused_sources.sql
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/documentation/fct_undocumented_models.sql
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/documentation/fct_undocumented_sources.sql
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/governance/fct_undocumented_public_models.sql
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}

order by distance desc
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/structure/fct_model_directories.sql
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ unioned as (

select * from unioned

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}


2 changes: 1 addition & 1 deletion models/marts/structure/fct_model_naming_conventions.sql
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ inappropriate_model_names as (

select * from inappropriate_model_names

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/structure/fct_source_directories.sql
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ inappropriate_subdirectories_sources as (

select * from inappropriate_subdirectories_sources

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/structure/fct_test_directories.sql
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ different_directories as (

select * from different_directories

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}
2 changes: 1 addition & 1 deletion models/marts/tests/fct_missing_primary_key_tests.sql
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ final as (

select * from final

{{ filter_exceptions(model.name) }}
{{ filter_exceptions() }}

0 comments on commit 11f8fda

Please sign in to comment.