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

…ameters

Extract URL Parameter Macro Update

.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

.gitignore

@@ -1,7 +1,8 @@
-
+env/
 target/
 dbt_modules/
 logs/
 .DS_Store
 integration_tests/.DS_Store
-dbt_packages/
+dbt_packages/
+package-lock.yml

CHANGELOG.md

@@ -1,3 +1,12 @@
+# dbt_twitter_source v0.7.1
+
+[PR #25](https://github.com/fivetran/dbt_twitter_source/pull/25) includes the following updates:
+## Bug Fixes
+- This package now leverages the new `twitter_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_twitter_source v0.7.0
 [PR #22](https://github.com/fivetran/dbt_twitter_source/pull/22) includes the following updates:
 ## Feature update 🎉

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'twitter_ads_source'
-version: '0.7.0'
+version: '0.7.1'
 
 
 config-version: 2

integration_tests/dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'twitter_source_integration_tests'
-version: '0.7.0'
+version: '0.7.1'
 
 
 profile: 'integration_tests'

integration_tests/requirements.txt

@@ -4,4 +4,4 @@ dbt-redshift>=1.3.0,<2.0.0
 dbt-postgres>=1.3.0,<2.0.0
 dbt-spark>=1.3.0,<2.0.0
 dbt-spark[PyHive]>=1.3.0,<2.0.0
-dbt-databricks>=1.3.0,<2.0.0
+dbt-databricks>=1.6.0,<2.0.0

macros/twitter_ads_extract_url_parameters.sql

@@ -0,0 +1,20 @@
+{% macro twitter_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ return(adapter.dispatch('twitter_ads_extract_url_parameter', 'twitter_ads_source') (field, url_parameter)) }}
+
+{% endmacro %}
+
+
+{% macro default__twitter_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ dbt_utils.get_url_parameter(field, url_parameter) }}
+
+{%- endmacro %}
+
+
+{% macro spark__twitter_ads_extract_url_parameter(field, url_parameter) -%}
+
+{%- set formatted_url_parameter = "'" + url_parameter + "=([^&]+)'" -%}
+nullif(regexp_extract({{ field }}, {{ formatted_url_parameter }}, 1), '')
+
+{%- endmacro %}

models/stg_twitter_ads__tweet_url.sql

@@ -40,11 +40,11 @@ final as (
         {{ dbt.split_part('expanded_url', "'?'", 1) }} as base_url,
         {{ dbt_utils.get_url_host('expanded_url') }} as url_host,
         '/' || {{ dbt_utils.get_url_path('expanded_url') }} as url_path,
-        {{ dbt_utils.get_url_parameter('expanded_url', 'utm_source') }} as utm_source,
-        {{ dbt_utils.get_url_parameter('expanded_url', 'utm_medium') }} as utm_medium,
-        {{ dbt_utils.get_url_parameter('expanded_url', 'utm_campaign') }} as utm_campaign,
-        {{ dbt_utils.get_url_parameter('expanded_url', 'utm_content') }} as utm_content,
-        {{ dbt_utils.get_url_parameter('expanded_url', 'utm_term') }} as utm_term
+        {{ twitter_ads_source.twitter_ads_extract_url_parameter('expanded_url', 'utm_source') }} as utm_source,
+        {{ twitter_ads_source.twitter_ads_extract_url_parameter('expanded_url', 'utm_medium') }} as utm_medium,
+        {{ twitter_ads_source.twitter_ads_extract_url_parameter('expanded_url', 'utm_campaign') }} as utm_campaign,
+        {{ twitter_ads_source.twitter_ads_extract_url_parameter('expanded_url', 'utm_content') }} as utm_content,
+        {{ twitter_ads_source.twitter_ads_extract_url_parameter('expanded_url', 'utm_term') }} as utm_term
 
     from fields