Merge pull request #22 from fivetran/MagicBot/package-extract-url-par…

…ameters Extract URL Parameter Macro Update
fivetran · Dec 14, 2023 · d66bbb0 · d66bbb0
2 parents 9aafcbf + b345652
commit d66bbb0
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 25 deletions.
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -0,0 +1,13 @@
+name: 'auto release'
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  call-workflow-passing-data:
+    if: github.event.pull_request.merged
+    uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
+    secrets: inherit
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@
 target/
 dbt_modules/
 logs/
-
-dbt_packages/
+env/
+dbt_packages/
+package-lock.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# dbt_snapchat_ads v0.6.1
+
+[PR #22](https://github.com/fivetran/dbt_snapchat_ads/pull/22) includes the following updates:
+## Bug Fixes
+- This package now leverages the new `snapchat_ads_extract_url_parameter()` macro for use in parsing out url parameters. This was added to create special logic for Databricks instances not supported by `dbt_utils.get_url_parameter()`.
+  - This macro will be replaced with the `fivetran_utils.extract_url_parameter()` macro in the next breaking change of this package.
+## Under the Hood
+- Included auto-releaser GitHub Actions workflow to automate future releases.
+
 # dbt_snapchat_ads v0.6.0
 [PR #19](https://github.com/fivetran/dbt_snapchat_ads/pull/19) includes the following updates:
 ## Feature update 🎉

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'snapchat_ads'
-version: '0.6.0'
+version: '0.6.1'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:

diff --git a/docs/catalog.json b/docs/catalog.json
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/manifest.json b/docs/manifest.json
diff --git a/docs/run_results.json b/docs/run_results.json
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'snapchat_ads_integration_tests'
-version: '0.6.0'
+version: '0.6.1'
 profile: 'integration_tests'
 config-version: 2
 

diff --git a/macros/snapchat_ads_extract_url_parameters.sql b/macros/snapchat_ads_extract_url_parameters.sql
@@ -0,0 +1,20 @@
+{% macro snapchat_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ return(adapter.dispatch('snapchat_ads_extract_url_parameter', 'snapchat_ads') (field, url_parameter)) }}
+
+{% endmacro %}
+
+
+{% macro default__snapchat_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ dbt_utils.get_url_parameter(field, url_parameter) }}
+
+{%- endmacro %}
+
+
+{% macro spark__snapchat_ads_extract_url_parameter(field, url_parameter) -%}
+
+{%- set formatted_url_parameter = "'" + url_parameter + "=([^&]+)'" -%}
+nullif(regexp_extract({{ field }}, {{ formatted_url_parameter }}, 1), '')
+
+{%- endmacro %}
diff --git a/models/intermediate/snapchat_ads__creative_history_prep.sql b/models/intermediate/snapchat_ads__creative_history_prep.sql
@@ -35,11 +35,11 @@ with base as (
         {{ dbt.split_part('base.url', "'?'", 1) }} as base_url,
         {{ dbt_utils.get_url_host('base.url') }} as url_host,
         '/' || {{ dbt_utils.get_url_path('base.url') }} as url_path,
-        coalesce(url_tags_pivoted.utm_source, {{ dbt_utils.get_url_parameter('base.url', 'utm_source') }}) as utm_source,
-        coalesce(url_tags_pivoted.utm_medium, {{ dbt_utils.get_url_parameter('base.url', 'utm_medium') }}) as utm_medium,
-        coalesce(url_tags_pivoted.utm_campaign, {{ dbt_utils.get_url_parameter('base.url', 'utm_campaign') }}) as utm_campaign,
-        coalesce(url_tags_pivoted.utm_content, {{ dbt_utils.get_url_parameter('base.url', 'utm_content') }}) as utm_content,
-        coalesce(url_tags_pivoted.utm_term, {{ dbt_utils.get_url_parameter('base.url', 'utm_term') }}) as utm_term
+        coalesce(url_tags_pivoted.utm_source, {{ snapchat_ads.snapchat_ads_extract_url_parameter('base.url', 'utm_source') }}) as utm_source,
+        coalesce(url_tags_pivoted.utm_medium, {{ snapchat_ads.snapchat_ads_extract_url_parameter('base.url', 'utm_medium') }}) as utm_medium,
+        coalesce(url_tags_pivoted.utm_campaign, {{ snapchat_ads.snapchat_ads_extract_url_parameter('base.url', 'utm_campaign') }}) as utm_campaign,
+        coalesce(url_tags_pivoted.utm_content, {{ snapchat_ads.snapchat_ads_extract_url_parameter('base.url', 'utm_content') }}) as utm_content,
+        coalesce(url_tags_pivoted.utm_term, {{ snapchat_ads.snapchat_ads_extract_url_parameter('base.url', 'utm_term') }}) as utm_term
     from base
     left join url_tags_pivoted
         on base.creative_id = url_tags_pivoted.creative_id
@@ -48,4 +48,4 @@ with base as (
 )
 
 select *
-from fields
+from fields