From 86059fc65768d42ccff649d0d1ff6683d9a80108 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Fri, 30 Oct 2020 11:51:01 -0700 Subject: [PATCH 1/5] update dbt versions and move macro to utils --- dbt_project.yml | 3 ++- models/sales/hubspot__engagements.sql | 6 +++--- packages.yml | 7 +++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index b9fab4f..ab2eb98 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,6 +1,7 @@ name: 'hubspot' -version: '1.0.0' +version: '2.0.0' config-version: 2 +require-dbt-version: [">=0.18.0", "<0.19.0"] vars: hubspot: diff --git a/models/sales/hubspot__engagements.sql b/models/sales/hubspot__engagements.sql index 6342b9d..a5d2af8 100644 --- a/models/sales/hubspot__engagements.sql +++ b/models/sales/hubspot__engagements.sql @@ -16,7 +16,7 @@ with engagements as ( select engagement_id, - {{ array_agg('contact_id') }} as contact_ids + {{ fivetran_utils.array_agg('contact_id') }} as contact_ids from contacts group by 1 @@ -33,7 +33,7 @@ with engagements as ( select engagement_id, - {{ array_agg('deal_id') }} as deal_ids + {{ fivetran_utils.array_agg('deal_id') }} as deal_ids from deals group by 1 @@ -50,7 +50,7 @@ with engagements as ( select engagement_id, - {{ array_agg('company_id') }} as company_ids + {{ fivetran_utils.array_agg('company_id') }} as company_ids from companies group by 1 diff --git a/packages.yml b/packages.yml index 6cf1d0f..442e245 100644 --- a/packages.yml +++ b/packages.yml @@ -1,6 +1,9 @@ packages: - package: fishtown-analytics/dbt_utils - version: [">=0.4.0"] + version: [">=0.6.0", "<0.7.0"] - package: fivetran/hubspot_source - version: 0.1.0 \ No newline at end of file + version: 2.0.0 + + - git: "https://github.com/fivetran/dbt_fivetran_utils.git" + warn-unpinned: false \ No newline at end of file From ef47974d17a26b2bcc6b2bcef82082dd84a953a8 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Fri, 30 Oct 2020 12:09:00 -0700 Subject: [PATCH 2/5] move macros --- macros/array_agg.sql | 17 ---------------- macros/enabled_vars.sql | 13 ------------ .../hubspot__email_event_bounce.sql | 2 +- .../hubspot__email_event_clicks.sql | 2 +- .../hubspot__email_event_deferred.sql | 2 +- .../hubspot__email_event_delivered.sql | 2 +- .../hubspot__email_event_dropped.sql | 2 +- .../hubspot__email_event_forward.sql | 2 +- .../hubspot__email_event_opens.sql | 2 +- .../hubspot__email_event_print.sql | 2 +- .../hubspot__email_event_sent.sql | 2 +- .../hubspot__email_event_spam_report.sql | 2 +- .../hubspot__email_event_status_change.sql | 2 +- models/marketing/hubspot__contact_lists.sql | 4 ++-- models/marketing/hubspot__contacts.sql | 4 ++-- models/marketing/hubspot__email_campaigns.sql | 2 +- models/marketing/hubspot__email_sends.sql | 4 ++-- ...hubspot__email_aggregate_status_change.sql | 2 +- .../int_hubspot__email_event_aggregates.sql | 2 +- ...ubspot__email_metrics__by_contact_list.sql | 2 +- ...ubspot__engagement_metrics__by_contact.sql | 2 +- .../hubspot__engagement_calls.sql | 2 +- .../hubspot__engagement_emails.sql | 2 +- .../hubspot__engagement_meetings.sql | 2 +- .../hubspot__engagement_notes.sql | 2 +- .../hubspot__engagement_tasks.sql | 2 +- .../history/hubspot__company_history.sql | 2 +- .../sales/history/hubspot__deal_history.sql | 2 +- models/sales/hubspot__companies.sql | 4 ++-- models/sales/hubspot__deals.sql | 4 ++-- models/sales/hubspot__engagements.sql | 20 +++++++++---------- 31 files changed, 43 insertions(+), 73 deletions(-) delete mode 100644 macros/array_agg.sql delete mode 100644 macros/enabled_vars.sql diff --git a/macros/array_agg.sql b/macros/array_agg.sql deleted file mode 100644 index ad357e8..0000000 --- a/macros/array_agg.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% macro array_agg(field_to_agg) -%} - -{{ adapter_macro('hubspot.array_agg', field_to_agg) }} - -{%- endmacro %} - -{% macro default__array_agg(field_to_agg) %} - array_agg({{ field_to_agg }}) -{% endmacro %} - -{% macro redshift__array_agg(field_to_agg) %} - listagg({{ field_to_agg }}, ',') -{% endmacro %} - -{% macro postgres__array_agg(field_to_agg) %} - string_agg({{ field_to_agg }}, ',') -{% endmacro %} \ No newline at end of file diff --git a/macros/enabled_vars.sql b/macros/enabled_vars.sql deleted file mode 100644 index ca9c9e7..0000000 --- a/macros/enabled_vars.sql +++ /dev/null @@ -1,13 +0,0 @@ -{% macro enabled_vars(vars) %} - -{% for v in vars %} - - {% if var(v, True) == False %} - {{ return(False) }} - {% endif %} - -{% endfor %} - -{{ return(True) }} - -{% endmacro %} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_bounce.sql b/models/marketing/email_events/hubspot__email_event_bounce.sql index 9534b3f..7d77481 100644 --- a/models/marketing/email_events/hubspot__email_event_bounce.sql +++ b/models/marketing/email_events/hubspot__email_event_bounce.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_bounce_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_bounce_enabled'])) }} {{ email_events_joined(var('email_event_bounce')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_clicks.sql b/models/marketing/email_events/hubspot__email_event_clicks.sql index 5474040..69509e4 100644 --- a/models/marketing/email_events/hubspot__email_event_clicks.sql +++ b/models/marketing/email_events/hubspot__email_event_clicks.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_click_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_click_enabled'])) }} {{ email_events_joined(var('email_event_click')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_deferred.sql b/models/marketing/email_events/hubspot__email_event_deferred.sql index 455e125..72cbfce 100644 --- a/models/marketing/email_events/hubspot__email_event_deferred.sql +++ b/models/marketing/email_events/hubspot__email_event_deferred.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }} +{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }} {{ email_events_joined(var('email_event_deferred')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_delivered.sql b/models/marketing/email_events/hubspot__email_event_delivered.sql index 8da80e7..2ea78df 100644 --- a/models/marketing/email_events/hubspot__email_event_delivered.sql +++ b/models/marketing/email_events/hubspot__email_event_delivered.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_delivered_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_delivered_enabled'])) }} {{ email_events_joined(var('email_event_delivered')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_dropped.sql b/models/marketing/email_events/hubspot__email_event_dropped.sql index 2673ab9..64d1764 100644 --- a/models/marketing/email_events/hubspot__email_event_dropped.sql +++ b/models/marketing/email_events/hubspot__email_event_dropped.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }} +{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }} {{ email_events_joined(var('email_event_dropped')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_forward.sql b/models/marketing/email_events/hubspot__email_event_forward.sql index ee3a9a1..b04303b 100644 --- a/models/marketing/email_events/hubspot__email_event_forward.sql +++ b/models/marketing/email_events/hubspot__email_event_forward.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_forward_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_forward_enabled'])) }} {{ email_events_joined(var('email_event_forward')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_opens.sql b/models/marketing/email_events/hubspot__email_event_opens.sql index 1966e82..921f836 100644 --- a/models/marketing/email_events/hubspot__email_event_opens.sql +++ b/models/marketing/email_events/hubspot__email_event_opens.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }} +{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }} {{ email_events_joined(var('email_event_open')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_print.sql b/models/marketing/email_events/hubspot__email_event_print.sql index e99d4f2..11374db 100644 --- a/models/marketing/email_events/hubspot__email_event_print.sql +++ b/models/marketing/email_events/hubspot__email_event_print.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_print_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_print_enabled'])) }} {{ email_events_joined(var('email_event_print')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_sent.sql b/models/marketing/email_events/hubspot__email_event_sent.sql index 40b4e74..259de48 100644 --- a/models/marketing/email_events/hubspot__email_event_sent.sql +++ b/models/marketing/email_events/hubspot__email_event_sent.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }} +{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }} {{ email_events_joined(var('email_event_sent')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_spam_report.sql b/models/marketing/email_events/hubspot__email_event_spam_report.sql index 144a8b3..ef252ff 100644 --- a/models/marketing/email_events/hubspot__email_event_spam_report.sql +++ b/models/marketing/email_events/hubspot__email_event_spam_report.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_spam_report_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_spam_report_enabled'])) }} {{ email_events_joined(var('email_event_spam_report')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_status_change.sql b/models/marketing/email_events/hubspot__email_event_status_change.sql index caaea97..1d7bbe5 100644 --- a/models/marketing/email_events/hubspot__email_event_status_change.sql +++ b/models/marketing/email_events/hubspot__email_event_status_change.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }} {{ email_events_joined(var('email_event_status_change')) }} \ No newline at end of file diff --git a/models/marketing/hubspot__contact_lists.sql b/models/marketing/hubspot__contact_lists.sql index 29bc4fc..09bd48f 100644 --- a/models/marketing/hubspot__contact_lists.sql +++ b/models/marketing/hubspot__contact_lists.sql @@ -1,11 +1,11 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled'])) }} with contact_lists as ( select * from {{ var('contact_list') }} -{% if enabled_vars(['hubspot_marketing_enabled', 'hubspot_email_event_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_marketing_enabled', 'hubspot_email_event_enabled']) %} ), email_metrics as ( diff --git a/models/marketing/hubspot__contacts.sql b/models/marketing/hubspot__contacts.sql index e877763..7412548 100644 --- a/models/marketing/hubspot__contacts.sql +++ b/models/marketing/hubspot__contacts.sql @@ -1,5 +1,5 @@ -{% set emails_enabled = enabled_vars(['hubspot_marketing_enabled', 'hubspot_email_event_enabled']) %} -{% set engagements_enabled = enabled_vars(['hubspot_sales_enabled', 'hubspot_engagement_enabled']) %} +{% set emails_enabled = fivetran_utils.enabled_vars(['hubspot_marketing_enabled', 'hubspot_email_event_enabled']) %} +{% set engagements_enabled = fivetran_utils.enabled_vars(['hubspot_sales_enabled', 'hubspot_engagement_enabled']) %} with contacts as ( diff --git a/models/marketing/hubspot__email_campaigns.sql b/models/marketing/hubspot__email_campaigns.sql index a985ddd..c79d566 100644 --- a/models/marketing/hubspot__email_campaigns.sql +++ b/models/marketing/hubspot__email_campaigns.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} {% set email_metrics = [ 'bounces', diff --git a/models/marketing/hubspot__email_sends.sql b/models/marketing/hubspot__email_sends.sql index 8a7ef03..be7e35b 100644 --- a/models/marketing/hubspot__email_sends.sql +++ b/models/marketing/hubspot__email_sends.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} with sends as ( @@ -40,7 +40,7 @@ with sends as ( spam_reports > 0 as was_spam_reported from joined -{% if enabled_vars(['hubspot_email_event_status_change_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_email_event_status_change_enabled']) %} ), unsubscribes as ( diff --git a/models/marketing/intermediate/int_hubspot__email_aggregate_status_change.sql b/models/marketing/intermediate/int_hubspot__email_aggregate_status_change.sql index bcd490f..d8457e3 100644 --- a/models/marketing/intermediate/int_hubspot__email_aggregate_status_change.sql +++ b/models/marketing/intermediate/int_hubspot__email_aggregate_status_change.sql @@ -1,5 +1,5 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_status_change_enabled'])) }} with base as ( diff --git a/models/marketing/intermediate/int_hubspot__email_event_aggregates.sql b/models/marketing/intermediate/int_hubspot__email_event_aggregates.sql index e6a0492..2b7ba12 100644 --- a/models/marketing/intermediate/int_hubspot__email_event_aggregates.sql +++ b/models/marketing/intermediate/int_hubspot__email_event_aggregates.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled'])) }} with events as ( diff --git a/models/marketing/intermediate/int_hubspot__email_metrics__by_contact_list.sql b/models/marketing/intermediate/int_hubspot__email_metrics__by_contact_list.sql index 321b5ba..8413480 100644 --- a/models/marketing/intermediate/int_hubspot__email_metrics__by_contact_list.sql +++ b/models/marketing/intermediate/int_hubspot__email_metrics__by_contact_list.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled']), materialized='table') }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled']), materialized='table') }} with email_sends as ( diff --git a/models/marketing/intermediate/int_hubspot__engagement_metrics__by_contact.sql b/models/marketing/intermediate/int_hubspot__engagement_metrics__by_contact.sql index 773f213..587726a 100644 --- a/models/marketing/intermediate/int_hubspot__engagement_metrics__by_contact.sql +++ b/models/marketing/intermediate/int_hubspot__engagement_metrics__by_contact.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_contact_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_contact_enabled'])) }} with engagements as ( diff --git a/models/sales/engagement_events/hubspot__engagement_calls.sql b/models/sales/engagement_events/hubspot__engagement_calls.sql index a01fbbb..bc719f7 100644 --- a/models/sales/engagement_events/hubspot__engagement_calls.sql +++ b/models/sales/engagement_events/hubspot__engagement_calls.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_call_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_call_enabled','hubspot_engagement_enabled'])) }} {{ engagements_joined(var('engagement_call')) }} \ No newline at end of file diff --git a/models/sales/engagement_events/hubspot__engagement_emails.sql b/models/sales/engagement_events/hubspot__engagement_emails.sql index 24e6232..93b1eec 100644 --- a/models/sales/engagement_events/hubspot__engagement_emails.sql +++ b/models/sales/engagement_events/hubspot__engagement_emails.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_email_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_email_enabled','hubspot_engagement_enabled'])) }} {{ engagements_joined(var('engagement_email')) }} \ No newline at end of file diff --git a/models/sales/engagement_events/hubspot__engagement_meetings.sql b/models/sales/engagement_events/hubspot__engagement_meetings.sql index e104e6d..eff7eb8 100644 --- a/models/sales/engagement_events/hubspot__engagement_meetings.sql +++ b/models/sales/engagement_events/hubspot__engagement_meetings.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_meeting_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_meeting_enabled','hubspot_engagement_enabled'])) }} {{ engagements_joined(var('engagement_meeting')) }} \ No newline at end of file diff --git a/models/sales/engagement_events/hubspot__engagement_notes.sql b/models/sales/engagement_events/hubspot__engagement_notes.sql index 497f8f2..4009599 100644 --- a/models/sales/engagement_events/hubspot__engagement_notes.sql +++ b/models/sales/engagement_events/hubspot__engagement_notes.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_note_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_note_enabled','hubspot_engagement_enabled'])) }} {{ engagements_joined(var('engagement_note')) }} \ No newline at end of file diff --git a/models/sales/engagement_events/hubspot__engagement_tasks.sql b/models/sales/engagement_events/hubspot__engagement_tasks.sql index e28642a..1c03bfe 100644 --- a/models/sales/engagement_events/hubspot__engagement_tasks.sql +++ b/models/sales/engagement_events/hubspot__engagement_tasks.sql @@ -1,3 +1,3 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_task_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_task_enabled','hubspot_engagement_enabled'])) }} {{ engagements_joined(var('engagement_task')) }} \ No newline at end of file diff --git a/models/sales/history/hubspot__company_history.sql b/models/sales/history/hubspot__company_history.sql index e384017..87a4437 100644 --- a/models/sales/history/hubspot__company_history.sql +++ b/models/sales/history/hubspot__company_history.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }} with history as ( diff --git a/models/sales/history/hubspot__deal_history.sql b/models/sales/history/hubspot__deal_history.sql index fc50a46..ea8f8e3 100644 --- a/models/sales/history/hubspot__deal_history.sql +++ b/models/sales/history/hubspot__deal_history.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }} with history as ( diff --git a/models/sales/hubspot__companies.sql b/models/sales/hubspot__companies.sql index 06d4f60..83b6ff2 100644 --- a/models/sales/hubspot__companies.sql +++ b/models/sales/hubspot__companies.sql @@ -1,11 +1,11 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_company_enabled'])) }} with companies as ( select * from {{ var('company') }} -{% if enabled_vars(['hubspot_engagement_enabled','hubspot_engagement_company_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_engagement_enabled','hubspot_engagement_company_enabled']) %} ), engagements as ( diff --git a/models/sales/hubspot__deals.sql b/models/sales/hubspot__deals.sql index 3d73acd..2a90860 100644 --- a/models/sales/hubspot__deals.sql +++ b/models/sales/hubspot__deals.sql @@ -1,4 +1,4 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }} with deals as ( @@ -36,7 +36,7 @@ with deals as ( left join owners using (owner_id) -{% if enabled_vars(['hubspot_engagement_enabled','hubspot_engagement_deal_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_engagement_enabled','hubspot_engagement_deal_enabled']) %} ), engagements as ( diff --git a/models/sales/hubspot__engagements.sql b/models/sales/hubspot__engagements.sql index a5d2af8..51383a7 100644 --- a/models/sales/hubspot__engagements.sql +++ b/models/sales/hubspot__engagements.sql @@ -1,11 +1,11 @@ -{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }} with engagements as ( select * from {{ var('engagement') }} -{% if enabled_vars(['hubspot_engagement_contact_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_engagement_contact_enabled']) %} ), contacts as ( @@ -22,7 +22,7 @@ with engagements as ( {% endif %} -{% if enabled_vars(['hubspot_engagement_deal_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_engagement_deal_enabled']) %} ), deals as ( @@ -39,7 +39,7 @@ with engagements as ( {% endif %} -{% if enabled_vars(['hubspot_engagement_company_enabled']) %} +{% if fivetran_utils.enabled_vars(['hubspot_engagement_company_enabled']) %} ), companies as ( @@ -59,14 +59,14 @@ with engagements as ( ), joined as ( select - {% if enabled_vars(['hubspot_engagement_contact_enabled']) %} contacts_agg.contact_ids, {% endif %} - {% if enabled_vars(['hubspot_engagement_deal_enabled']) %} deals_agg.deal_ids, {% endif %} - {% if enabled_vars(['hubspot_engagement_company_enabled']) %} companies_agg.company_ids, {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_contact_enabled']) %} contacts_agg.contact_ids, {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_deal_enabled']) %} deals_agg.deal_ids, {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_company_enabled']) %} companies_agg.company_ids, {% endif %} engagements.* from engagements - {% if enabled_vars(['hubspot_engagement_contact_enabled']) %} left join contacts_agg using (engagement_id) {% endif %} - {% if enabled_vars(['hubspot_engagement_deal_enabled']) %} left join deals_agg using (engagement_id) {% endif %} - {% if enabled_vars(['hubspot_engagement_company_enabled']) %} left join companies_agg using (engagement_id) {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_contact_enabled']) %} left join contacts_agg using (engagement_id) {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_deal_enabled']) %} left join deals_agg using (engagement_id) {% endif %} + {% if fivetran_utils.enabled_vars(['hubspot_engagement_company_enabled']) %} left join companies_agg using (engagement_id) {% endif %} ) From 4abb1205f2cc89b47f5bb36afb5a5960a13246b6 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Fri, 30 Oct 2020 14:27:00 -0700 Subject: [PATCH 3/5] fix some typos --- models/marketing/email_events/hubspot__email_event_deferred.sql | 2 +- models/marketing/email_events/hubspot__email_event_dropped.sql | 2 +- models/marketing/email_events/hubspot__email_event_opens.sql | 2 +- models/marketing/email_events/hubspot__email_event_sent.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/marketing/email_events/hubspot__email_event_deferred.sql b/models/marketing/email_events/hubspot__email_event_deferred.sql index 72cbfce..79558d9 100644 --- a/models/marketing/email_events/hubspot__email_event_deferred.sql +++ b/models/marketing/email_events/hubspot__email_event_deferred.sql @@ -1,3 +1,3 @@ -{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }} {{ email_events_joined(var('email_event_deferred')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_dropped.sql b/models/marketing/email_events/hubspot__email_event_dropped.sql index 64d1764..0f4d72e 100644 --- a/models/marketing/email_events/hubspot__email_event_dropped.sql +++ b/models/marketing/email_events/hubspot__email_event_dropped.sql @@ -1,3 +1,3 @@ -{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }} {{ email_events_joined(var('email_event_dropped')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_opens.sql b/models/marketing/email_events/hubspot__email_event_opens.sql index 921f836..e69f0e9 100644 --- a/models/marketing/email_events/hubspot__email_event_opens.sql +++ b/models/marketing/email_events/hubspot__email_event_opens.sql @@ -1,3 +1,3 @@ -{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }} {{ email_events_joined(var('email_event_open')) }} \ No newline at end of file diff --git a/models/marketing/email_events/hubspot__email_event_sent.sql b/models/marketing/email_events/hubspot__email_event_sent.sql index 259de48..2f21a0e 100644 --- a/models/marketing/email_events/hubspot__email_event_sent.sql +++ b/models/marketing/email_events/hubspot__email_event_sent.sql @@ -1,3 +1,3 @@ -{{ config(enabled=fivetran_utils.fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }} +{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }} {{ email_events_joined(var('email_event_sent')) }} \ No newline at end of file From 157ecaee3d9ba866ab032093f70da537216eb598 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Mon, 2 Nov 2020 10:17:06 -0800 Subject: [PATCH 4/5] fix version tags --- dbt_project.yml | 2 +- packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index ab2eb98..4b886b1 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'hubspot' -version: '2.0.0' +version: '0.2.0' config-version: 2 require-dbt-version: [">=0.18.0", "<0.19.0"] diff --git a/packages.yml b/packages.yml index 442e245..6d9abab 100644 --- a/packages.yml +++ b/packages.yml @@ -3,7 +3,7 @@ packages: version: [">=0.6.0", "<0.7.0"] - package: fivetran/hubspot_source - version: 2.0.0 + version: [">=0.2.0", "<0.3.0"] - git: "https://github.com/fivetran/dbt_fivetran_utils.git" warn-unpinned: false \ No newline at end of file From 65f9ab544dcd2699d4a69502637bac0842face70 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Mon, 2 Nov 2020 10:22:06 -0800 Subject: [PATCH 5/5] clean up packages deps --- packages.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages.yml b/packages.yml index 6d9abab..5e90710 100644 --- a/packages.yml +++ b/packages.yml @@ -1,9 +1,3 @@ packages: - - package: fishtown-analytics/dbt_utils - version: [">=0.6.0", "<0.7.0"] - - package: fivetran/hubspot_source - version: [">=0.2.0", "<0.3.0"] - - - git: "https://github.com/fivetran/dbt_fivetran_utils.git" - warn-unpinned: false \ No newline at end of file + version: [">=0.2.0", "<0.3.0"] \ No newline at end of file