From 6fe12b9c1ad953329f69f48a0afdc96d87986f99 Mon Sep 17 00:00:00 2001 From: fivetran-reneeli Date: Tue, 28 Sep 2021 17:08:06 +0100 Subject: [PATCH 1/5] update versioning --- dbt_project.yml | 2 +- integration_tests/dbt_project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index 415d935..d3b50e3 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'klaviyo' -version: '0.2.0' +version: '0.2.1' config-version: 2 require-dbt-version: ">=0.20.0" diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 73d24af..79cf75b 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'klaviyo_integration_tests' -version: '0.2.0' +version: '0.2.1' config-version: 2 profile: 'integration_tests' From b39427a7e93e0821c2d7d5f23b9f61e0f456f188 Mon Sep 17 00:00:00 2001 From: fivetran-reneeli Date: Tue, 28 Sep 2021 17:14:43 +0100 Subject: [PATCH 2/5] removing snowflake conditionals --- models/klaviyo__campaigns.sql | 2 +- models/klaviyo__events.sql | 4 ++-- models/klaviyo__flows.sql | 2 +- models/klaviyo__persons.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/models/klaviyo__campaigns.sql b/models/klaviyo__campaigns.sql index ce3be3c..c31e8b4 100644 --- a/models/klaviyo__campaigns.sql +++ b/models/klaviyo__campaigns.sql @@ -13,7 +13,7 @@ campaign_metrics as ( campaign_join as ( {% set exclude_fields = [ 'last_touch_campaign_id', 'last_touch_flow_id'] %} - {% set exclude_fields = exclude_fields | upper if target.type == 'snowflake' else exclude_fields %} -- snowflake needs uppercase :) + {% set exclude_fields = exclude_fields %} select campaign.*, -- has campaign_id diff --git a/models/klaviyo__events.sql b/models/klaviyo__events.sql index 8d3922e..f3e198d 100644 --- a/models/klaviyo__events.sql +++ b/models/klaviyo__events.sql @@ -36,8 +36,8 @@ event_fields as ( -- excluding some fields to rename them and/or make them null if needed {% set exclude_fields = ['touch_session', 'last_touch_id', 'session_start_at', 'session_event_type', 'type', 'session_touch_type'] %} - -- snowflake has to be uppercase :) - {% set exclude_fields = exclude_fields | upper if target.type == 'snowflake' else exclude_fields %} + -- as of the patch release of dbt-utils v0.7.3, the snowflake uppercasing is not needed anymore so we have deleted the snowflake conditional in the exclusion + {% set exclude_fields = exclude_fields %} select {{ dbt_utils.star(from=ref('int_klaviyo__event_attribution'), except=exclude_fields) }}, diff --git a/models/klaviyo__flows.sql b/models/klaviyo__flows.sql index 5224604..a6b994f 100644 --- a/models/klaviyo__flows.sql +++ b/models/klaviyo__flows.sql @@ -13,7 +13,7 @@ flow_metrics as ( flow_join as ( {% set exclude_fields = [ 'last_touch_campaign_id', 'last_touch_flow_id'] %} - {% set exclude_fields = exclude_fields | upper if target.type == 'snowflake' else exclude_fields %} -- snowflake needs uppercase :) + {% set exclude_fields = exclude_fields %} select flow.*, -- has flow_id diff --git a/models/klaviyo__persons.sql b/models/klaviyo__persons.sql index f5b8f9e..0f171b9 100644 --- a/models/klaviyo__persons.sql +++ b/models/klaviyo__persons.sql @@ -14,7 +14,7 @@ person_join as ( select person.*, - {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['person_id'] if target.type != 'snowflake' else ['PERSON_ID'] ) }} + {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['person_id']) }} from person left join person_metrics using(person_id) From b391e0a2e7ba20fd35f63fabfbabb1bc7fdcf39d Mon Sep 17 00:00:00 2001 From: fivetran-reneeli Date: Tue, 28 Sep 2021 18:48:27 +0100 Subject: [PATCH 3/5] fix column exception to uppercase --- models/klaviyo__persons.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/klaviyo__persons.sql b/models/klaviyo__persons.sql index 0f171b9..1e837ff 100644 --- a/models/klaviyo__persons.sql +++ b/models/klaviyo__persons.sql @@ -14,7 +14,7 @@ person_join as ( select person.*, - {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['person_id']) }} + {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['PERSON_ID'] ) }} from person left join person_metrics using(person_id) From b99b8bd808f2cc88ea119a918e7a7bbc7d76785b Mon Sep 17 00:00:00 2001 From: fivetran-reneeli Date: Tue, 28 Sep 2021 20:04:52 +0100 Subject: [PATCH 4/5] reverting uppercase commit --- models/klaviyo__persons.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/klaviyo__persons.sql b/models/klaviyo__persons.sql index 1e837ff..0f171b9 100644 --- a/models/klaviyo__persons.sql +++ b/models/klaviyo__persons.sql @@ -14,7 +14,7 @@ person_join as ( select person.*, - {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['PERSON_ID'] ) }} + {{ dbt_utils.star(from=ref('int_klaviyo__person_metrics'), except=['person_id']) }} from person left join person_metrics using(person_id) From a7e190827fc05132ed4a82ad94757c2204ab625a Mon Sep 17 00:00:00 2001 From: fivetran-reneeli Date: Thu, 30 Sep 2021 18:37:44 +0100 Subject: [PATCH 5/5] remove unnecessary exclusion line --- models/klaviyo__campaigns.sql | 1 - models/klaviyo__events.sql | 1 - models/klaviyo__flows.sql | 1 - 3 files changed, 3 deletions(-) diff --git a/models/klaviyo__campaigns.sql b/models/klaviyo__campaigns.sql index c31e8b4..1d8dfed 100644 --- a/models/klaviyo__campaigns.sql +++ b/models/klaviyo__campaigns.sql @@ -13,7 +13,6 @@ campaign_metrics as ( campaign_join as ( {% set exclude_fields = [ 'last_touch_campaign_id', 'last_touch_flow_id'] %} - {% set exclude_fields = exclude_fields %} select campaign.*, -- has campaign_id diff --git a/models/klaviyo__events.sql b/models/klaviyo__events.sql index f3e198d..bedf721 100644 --- a/models/klaviyo__events.sql +++ b/models/klaviyo__events.sql @@ -37,7 +37,6 @@ event_fields as ( -- excluding some fields to rename them and/or make them null if needed {% set exclude_fields = ['touch_session', 'last_touch_id', 'session_start_at', 'session_event_type', 'type', 'session_touch_type'] %} -- as of the patch release of dbt-utils v0.7.3, the snowflake uppercasing is not needed anymore so we have deleted the snowflake conditional in the exclusion - {% set exclude_fields = exclude_fields %} select {{ dbt_utils.star(from=ref('int_klaviyo__event_attribution'), except=exclude_fields) }}, diff --git a/models/klaviyo__flows.sql b/models/klaviyo__flows.sql index a6b994f..5884ab8 100644 --- a/models/klaviyo__flows.sql +++ b/models/klaviyo__flows.sql @@ -13,7 +13,6 @@ flow_metrics as ( flow_join as ( {% set exclude_fields = [ 'last_touch_campaign_id', 'last_touch_flow_id'] %} - {% set exclude_fields = exclude_fields %} select flow.*, -- has flow_id