Merge pull request #27 from fivetran/updates

Updates
fivetran · Nov 2, 2020 · 703b0f8 · 703b0f8
2 parents ef0190c + 65f9ab5
commit 703b0f8
Show file tree

Hide file tree

Showing 33 changed files with 49 additions and 81 deletions.
diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,6 +1,7 @@
 name: 'hubspot'
-version: '1.0.0'
+version: '0.2.0'
 config-version: 2
+require-dbt-version: [">=0.18.0", "<0.19.0"]
 
 vars:
   hubspot:

diff --git a/macros/array_agg.sql b/macros/array_agg.sql
diff --git a/macros/enabled_vars.sql b/macros/enabled_vars.sql
diff --git 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')) }}
diff --git 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')) }}
diff --git 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.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_deferred_enabled'])) }}
 
 {{ email_events_joined(var('email_event_deferred')) }}
diff --git 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')) }}
diff --git 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.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_dropped_enabled'])) }}
 
 {{ email_events_joined(var('email_event_dropped')) }}
diff --git 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')) }}
diff --git 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.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_open_enabled'])) }}
 
 {{ email_events_joined(var('email_event_open')) }}
diff --git 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')) }}
diff --git 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.enabled_vars(['hubspot_marketing_enabled','hubspot_email_event_enabled','hubspot_email_event_sent_enabled'])) }}
 
 {{ email_events_joined(var('email_event_sent')) }}
diff --git 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')) }}
diff --git 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')) }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')) }}
diff --git 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')) }}
diff --git 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')) }}
diff --git 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')) }}
diff --git 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')) }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 (
 
@@ -16,13 +16,13 @@ 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
 
 {% endif %}
 
-{% if enabled_vars(['hubspot_engagement_deal_enabled']) %}
+{% if fivetran_utils.enabled_vars(['hubspot_engagement_deal_enabled']) %}
 
 ), deals as (
 
@@ -33,13 +33,13 @@ 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
 
 {% endif %}
 
-{% if enabled_vars(['hubspot_engagement_company_enabled']) %}
+{% if fivetran_utils.enabled_vars(['hubspot_engagement_company_enabled']) %}
 
 ), companies as (
 
@@ -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
 
@@ -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 %}
 
 )
 

diff --git a/packages.yml b/packages.yml
@@ -1,6 +1,3 @@
 packages:
-  - package: fishtown-analytics/dbt_utils
-    version: [">=0.4.0"]
-
   - package: fivetran/hubspot_source
-    version: 0.1.0
+    version: [">=0.2.0", "<0.3.0"]