Merge pull request #16 from fivetran/updates

update package for dbt 0.18.0
fivetran · Nov 2, 2020 · 96f6278 · 96f6278
2 parents a81103e + 3614ad5
commit 96f6278
Show file tree

Hide file tree

Showing 40 changed files with 49 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This package contains staging models, designed to work simultaneously with our [
 
 * Remove any rows that are soft-deleted
 * Name columns consistently across all packages:
-* Boolean fields are prefixed with is_ or has_
+* Boolean fields are prefixed with `is_` or `has_`
 * Timestamps are appended with `_timestamp`
 * ID primary keys are prefixed with the name of the table. For example, the user table's ID column is renamed user_id.
 

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,7 +1,7 @@
 name: 'hubspot_source'
-version: '1.0.0'
+version: '0.2.0'
 config-version: 2
-require-dbt-version: ">=0.17.0"
+require-dbt-version: [">=0.18.0", "<0.19.0"]
 
 vars:
   hubspot_source: 

diff --git a/macros/enabled_vars.sql b/macros/enabled_vars.sql
diff --git a/macros/full_name.sql b/macros/full_name.sql
diff --git a/macros/remove_prefix_from_columns.sql b/macros/remove_prefix_from_columns.sql
diff --git a/models/stg_hubspot__company.sql b/models/stg_hubspot__company.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'])) }}
 
 {%- set columns = adapter.get_columns_in_relation(ref('stg_hubspot__company_adapter')) -%}
 
@@ -12,7 +12,7 @@ with base as (
 
     select
         id as company_id, 
-        {{ remove_prefix_from_columns(columns=columns, exclude=['id']) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_', exclude=['id']) }}
     from base
 
 )

diff --git a/models/stg_hubspot__company_adapter.sql b/models/stg_hubspot__company_adapter.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'])) }}
 
 select *
 from {{ var('company') }}
diff --git a/models/stg_hubspot__company_property_history.sql b/models/stg_hubspot__company_property_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 base as (
 

diff --git a/models/stg_hubspot__contact.sql b/models/stg_hubspot__contact.sql
@@ -4,13 +4,13 @@ with base as (
 
     select *
     from {{ ref('stg_hubspot__contact_adapter') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 
     select
         id as contact_id,
-        {{ remove_prefix_from_columns(columns=columns, exclude=['id']) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_', exclude=['id']) }}
     from base
 
 )

diff --git a/models/stg_hubspot__contact_list.sql b/models/stg_hubspot__contact_list.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('contact_list') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 

diff --git a/models/stg_hubspot__contact_list_member.sql b/models/stg_hubspot__contact_list_member.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_marketing_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_marketing_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('contact_list_member') }}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 

diff --git a/models/stg_hubspot__deal.sql b/models/stg_hubspot__deal.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'])) }}
 
 {%- set columns = adapter.get_columns_in_relation(ref('stg_hubspot__deal_adapter')) -%}
 
@@ -11,7 +11,7 @@ with base as (
 ), fields as (
 
     select
-        {{ remove_prefix_from_columns(columns=columns) }}
+        {{ fivetran_utils.remove_prefix_from_columns(columns=columns, prefix='property_') }}
     from base
 
 )

diff --git a/models/stg_hubspot__deal_adapter.sql b/models/stg_hubspot__deal_adapter.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'])) }}
 
 select *
 from {{ var('deal') }}
diff --git a/models/stg_hubspot__deal_pipeline.sql b/models/stg_hubspot__deal_pipeline.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('deal_pipeline')}}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 

diff --git a/models/stg_hubspot__deal_pipeline_stage.sql b/models/stg_hubspot__deal_pipeline_stage.sql
@@ -1,10 +1,10 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_deal_enabled'])) }}
 
 with base as (
 
     select *
     from {{ var('deal_pipeline_stage')}}
-    where _fivetran_deleted is null
+    where not coalesce(_fivetran_deleted, false) 
 
 ), fields as (
 

diff --git a/models/stg_hubspot__deal_property_history.sql b/models/stg_hubspot__deal_property_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 base as (
 

diff --git a/models/stg_hubspot__email_campaign.sql b/models/stg_hubspot__email_campaign.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 base as (
 

diff --git a/models/stg_hubspot__email_event.sql b/models/stg_hubspot__email_event.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 base as (
 

diff --git a/models/stg_hubspot__email_event_bounce.sql b/models/stg_hubspot__email_event_bounce.sql
@@ -1,5 +1,5 @@
 
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_click.sql b/models/stg_hubspot__email_event_click.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_deferred.sql b/models/stg_hubspot__email_event_deferred.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_delivered.sql b/models/stg_hubspot__email_event_delivered.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_dropped.sql b/models/stg_hubspot__email_event_dropped.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_forward.sql b/models/stg_hubspot__email_event_forward.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_open.sql b/models/stg_hubspot__email_event_open.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_print.sql b/models/stg_hubspot__email_event_print.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_sent.sql b/models/stg_hubspot__email_event_sent.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_spam_report.sql b/models/stg_hubspot__email_event_spam_report.sql
@@ -1,4 +1,4 @@
-{{ 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'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__email_event_status_change.sql b/models/stg_hubspot__email_event_status_change.sql
@@ -1,4 +1,4 @@
-{{ 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/stg_hubspot__engagement.sql b/models/stg_hubspot__engagement.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_call.sql b/models/stg_hubspot__engagement_call.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_call_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_call_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_company.sql b/models/stg_hubspot__engagement_company.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_company_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_company_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_contact.sql b/models/stg_hubspot__engagement_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 base as (
 

diff --git a/models/stg_hubspot__engagement_deal.sql b/models/stg_hubspot__engagement_deal.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_deal_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_deal_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_email.sql b/models/stg_hubspot__engagement_email.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_meeting.sql b/models/stg_hubspot__engagement_meeting.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_email_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_note.sql b/models/stg_hubspot__engagement_note.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_note_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_note_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__engagement_task.sql b/models/stg_hubspot__engagement_task.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_task_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_engagement_enabled','hubspot_engagement_task_enabled'])) }}
 
 with base as (
 

diff --git a/models/stg_hubspot__owner.sql b/models/stg_hubspot__owner.sql
@@ -1,4 +1,4 @@
-{{ config(enabled=enabled_vars(['hubspot_sales_enabled','hubspot_owner_enabled'])) }}
+{{ config(enabled=fivetran_utils.enabled_vars(['hubspot_sales_enabled','hubspot_owner_enabled'])) }}
 
 with base as (
 
@@ -17,7 +17,7 @@ with base as (
         portal_id,
         type as owner_type,
         updated_at as updated_timestamp,
-        {{ full_name('first_name','last_name') }}
+        trim( {{ dbt_utils.concat(['first_name', "' '", 'last_name']) }} ) as full_name
     from base
 
 )

diff --git a/packages.yml b/packages.yml
@@ -1,3 +1,6 @@
 packages:
   - package: fishtown-analytics/dbt_utils
-    version: [">=0.4.0"]
+    version: [">=0.6.0", "<0.7.0"]
+
+  - git: "https://github.com/fivetran/dbt_fivetran_utils.git"
+    warn-unpinned: false