bug/owner-variable

fivetran · Dec 12, 2023 · ab112bf · ab112bf
1 parent baf5228
commit ab112bf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh
@@ -27,7 +27,7 @@ dbt run --vars '{hubspot_service_enabled: true, hubspot_marketing_enabled: true,
 dbt run --vars '{hubspot_service_enabled: true, hubspot_marketing_enabled: true, hubspot_sales_enabled: false}' --target "$db"
 dbt test --target "$db"
 dbt run --vars '{hubspot_marketing_enabled: true, hubspot_contact_merge_audit_enabled: true, hubspot_sales_enabled: false}' --target "$db" --full-refresh
-dbt run --vars '{hubspot_marketing_enabled: false, hubspot_sales_enabled: true, hubspot__pass_through_all_columns: true, hubspot_using_all_email_events: false}' --target "$db" --full-refresh
+dbt run --vars '{hubspot_marketing_enabled: false, hubspot_sales_enabled: true, hubspot__pass_through_all_columns: true, hubspot_using_all_email_events: false, hubspot_owner_enabled: false}' --target "$db" --full-refresh
 dbt test --target "$db"
 
 dbt run-operation fivetran_utils.drop_schemas_automation --target "$db"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# dbt_hubspot v0.15.1
+[PR #129](https://github.com/fivetran/dbt_hubspot/pull/129) includes the following updates:
+- Updated model `int_hubspot__deals_enhanced` so that fields from the OWNER source are not included when `hubspot_owner_enabled` is set to false. 
+
 # dbt_hubspot v0.15.0
 
 [PR #127](https://github.com/fivetran/dbt_hubspot/pull/127) includes the following updates:

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'hubspot'
-version: '0.15.0'
+version: '0.15.1'
 
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]

diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'hubspot_integration_tests'
-version: '0.15.0'
+version: '0.15.1'
 
 profile: 'integration_tests'
 config-version: 2

diff --git a/models/sales/intermediate/int_hubspot__deals_enhanced.sql b/models/sales/intermediate/int_hubspot__deals_enhanced.sql
@@ -15,10 +15,12 @@ with deals as (
     select *
     from {{ var('deal_pipeline_stage') }}
 
+{% if var('hubspot_owner_enabled', true) %}
 ), owners as (
 
     select *
     from {{ var('owner') }}
+{% endif %}
 
 ), deal_fields_joined as (
 
@@ -30,16 +32,23 @@ with deals as (
         coalesce(pipeline_stages.is_deal_pipeline_stage_deleted, false) as is_deal_pipeline_stage_deleted,
         pipelines.deal_pipeline_created_at,
         pipelines.deal_pipeline_updated_at,
-        pipeline_stages.pipeline_stage_label,
-        owners.email_address as owner_email_address,
-        owners.full_name as owner_full_name
+        pipeline_stages.pipeline_stage_label
+
+        {% if var('hubspot_owner_enabled', true) %}
+        , owners.email_address as owner_email_address
+        , owners.full_name as owner_full_name
+        {% endif %}
+
     from deals    
     left join pipelines 
         on deals.deal_pipeline_id = pipelines.deal_pipeline_id
     left join pipeline_stages 
         on deals.deal_pipeline_stage_id = pipeline_stages.deal_pipeline_stage_id
+
+    {% if var('hubspot_owner_enabled', true) %}
     left join owners 
         on deals.owner_id = owners.owner_id
+    {% endif %}
 )
 
 select *