Merge branch 'main' into dc/fix-governance-exclusion

Author: dave-connors-3

dbt_project.yml

@@ -67,12 +67,14 @@ vars:
   # -- Naming conventions variables --
   # to add a new "model type", update the variable model_types 
   # and create new variables with the names <model_type>_folder_name and/or <model_type>_prefixes 
-  model_types: ['staging', 'intermediate', 'marts', 'other']
+  model_types: ['base', 'staging', 'intermediate', 'marts', 'other']
 
+  base_folder_name: 'base'
   staging_folder_name: 'staging'
   intermediate_folder_name: 'intermediate'
   marts_folder_name: 'marts'
 
+  base_prefixes: ['base_']
   staging_prefixes: ['stg_']
   intermediate_prefixes: ['int_']
   marts_prefixes: ['fct_', 'dim_']

integration_tests/dbt_project.yml

@@ -61,7 +61,7 @@ vars:
   # ensure integration tests run successfully when there are 0 of a given model type (extra)
   exclude_packages: ['exclude_package']
   exclude_paths_from_project: ["/to_exclude/","source_3.table_6"]
-  model_types: ['staging', 'intermediate', 'marts', 'other', 'extra', 'new_model_type']
+  model_types: ['base','staging', 'intermediate', 'marts', 'other', 'extra', 'new_model_type']
   # dummy variable used for testing fct_hard_coded_references
   my_table_reference: 'grace_table'
   new_model_type_folder_name: 'my_new_models'

integration_tests/models/dbt_project_evaluator_schema_tests/core.yml

@@ -21,6 +21,12 @@ models:
         description: this contains the on_schema_change setting for incremental models. This column was sometimes an empty string, so should be tested to detect regressions
         tests:
           - is_not_empty_string
+      - name: model_type
+        tests: 
+          - dbt_utils.expression_is_true:
+              expression: "= 'base'"
+              config:
+                where: "resource_name = 'base_model_10'"
 
   - name: int_direct_relationships
     description: "This table shows one record for each direct parent/child pair in the graph."

integration_tests/models/staging/to_exclude/base/base_model_10.sql

@@ -0,0 +1,3 @@
+
+
+select true