Skip to content

Commit 858e588

Browse files
Merge pull request #129 from fivetran/bug/owner-variable
bug/owner-variable
2 parents baf5228 + a80355d commit 858e588

File tree

9 files changed

+40
-9
lines changed

9 files changed

+40
-9
lines changed

.buildkite/scripts/run_models.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dbt run --vars '{hubspot_service_enabled: true, hubspot_marketing_enabled: true,
2727
dbt run --vars '{hubspot_service_enabled: true, hubspot_marketing_enabled: true, hubspot_sales_enabled: false}' --target "$db"
2828
dbt test --target "$db"
2929
dbt run --vars '{hubspot_marketing_enabled: true, hubspot_contact_merge_audit_enabled: true, hubspot_sales_enabled: false}' --target "$db" --full-refresh
30-
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
30+
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
3131
dbt test --target "$db"
3232

3333
dbt run-operation fivetran_utils.drop_schemas_automation --target "$db"

.github/workflows/auto-release.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: 'auto release'
2+
on:
3+
pull_request:
4+
types:
5+
- closed
6+
branches:
7+
- main
8+
9+
jobs:
10+
call-workflow-passing-data:
11+
if: github.event.pull_request.merged
12+
uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
13+
secrets: inherit

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# dbt_hubspot v0.15.1
2+
[PR #129](https://github.com/fivetran/dbt_hubspot/pull/129) includes the following updates:
3+
4+
## Bug Fixes
5+
- Updated model `int_hubspot__deals_enhanced` so that fields from the `owner` source are not included when `hubspot_owner_enabled` is set to false.
6+
7+
## Under the Hood
8+
- Included auto-releaser GitHub Actions workflow to automate future releases.
9+
110
# dbt_hubspot v0.15.0
211

312
[PR #127](https://github.com/fivetran/dbt_hubspot/pull/127) includes the following updates:

dbt_project.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'hubspot'
2-
version: '0.15.0'
2+
version: '0.15.1'
33

44
config-version: 2
55
require-dbt-version: [">=1.3.0", "<2.0.0"]

docs/catalog.json

+1-1
Large diffs are not rendered by default.

docs/manifest.json

+1-1
Large diffs are not rendered by default.

docs/run_results.json

+1-1
Large diffs are not rendered by default.

integration_tests/dbt_project.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'hubspot_integration_tests'
2-
version: '0.15.0'
2+
version: '0.15.1'
33

44
profile: 'integration_tests'
55
config-version: 2

models/sales/intermediate/int_hubspot__deals_enhanced.sql

+12-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ with deals as (
1515
select *
1616
from {{ var('deal_pipeline_stage') }}
1717

18+
{% if var('hubspot_owner_enabled', true) %}
1819
), owners as (
1920

2021
select *
2122
from {{ var('owner') }}
23+
{% endif %}
2224

2325
), deal_fields_joined as (
2426

@@ -30,16 +32,23 @@ with deals as (
3032
coalesce(pipeline_stages.is_deal_pipeline_stage_deleted, false) as is_deal_pipeline_stage_deleted,
3133
pipelines.deal_pipeline_created_at,
3234
pipelines.deal_pipeline_updated_at,
33-
pipeline_stages.pipeline_stage_label,
34-
owners.email_address as owner_email_address,
35-
owners.full_name as owner_full_name
35+
pipeline_stages.pipeline_stage_label
36+
37+
{% if var('hubspot_owner_enabled', true) %}
38+
, owners.email_address as owner_email_address
39+
, owners.full_name as owner_full_name
40+
{% endif %}
41+
3642
from deals
3743
left join pipelines
3844
on deals.deal_pipeline_id = pipelines.deal_pipeline_id
3945
left join pipeline_stages
4046
on deals.deal_pipeline_stage_id = pipeline_stages.deal_pipeline_stage_id
47+
48+
{% if var('hubspot_owner_enabled', true) %}
4149
left join owners
4250
on deals.owner_id = owners.owner_id
51+
{% endif %}
4352
)
4453

4554
select *

0 commit comments

Comments
 (0)