Merge pull request #372 from dbt-labs/fix-exlcusion-redux

Fix exclusion: redux
dbt-labs · Aug 17, 2023 · 9a73300 · 9a73300
2 parents 9d7676d + 907c520
commit 9a73300
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/integration_tests/exclude_package/models/excluded_model.sql b/integration_tests/exclude_package/models/excluded_model.sql
diff --git a/..._tests/exclude_package/models/_models.yml → ...xclude_package/models/staging/_models.yml b/..._tests/exclude_package/models/_models.yml → ...xclude_package/models/staging/_models.yml
diff --git a/integration_tests/exclude_package/models/staging/_sources.yml b/integration_tests/exclude_package/models/staging/_sources.yml
@@ -0,0 +1,4 @@
+sources:
+  - name: fake_source
+    tables:
+      - name: fake_source
diff --git a/integration_tests/exclude_package/models/staging/excluded_model.sql b/integration_tests/exclude_package/models/staging/excluded_model.sql
@@ -0,0 +1,2 @@
+-- {{ source('fake_source', 'fake_source') }}
+select 1 as id
diff --git a/models/marts/structure/fct_model_directories.sql b/models/marts/structure/fct_model_directories.sql
@@ -14,6 +14,7 @@ folders as (
 
 all_dag_relationships as (
     select * from {{ ref('int_all_dag_relationships') }}
+    where not child_is_excluded
 ),
 
 staging_models as (
@@ -56,7 +57,6 @@ innappropriate_subdirectories_non_staging_models as (
         on folders.model_type = all_graph_resources.model_type 
     -- either appropriate folder_name is not in the current_directory_path or a inappropriate folder name is closer to the file_name
     where all_graph_resources.model_type <> all_graph_resources.model_type_folder 
-    and not is_excluded
 ),
 
 unioned as (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- {{ source('fake_source', 'fake_source') }}
		select 1 as id