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

…ameters Extract URL Parameter Macro Update
fivetran · Dec 14, 2023 · 54d7f35 · 54d7f35
2 parents 8eee77a + 948aab7
commit 54d7f35
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 26 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
@@ -1,6 +1,7 @@
-
+env/
 target/
 dbt_modules/
 logs/
 .DS_Store
-dbt_packages/
+dbt_packages/
+package-lock.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# dbt_pinterest_source v0.10.1
+
+[PR #31](https://github.com/fivetran/dbt_pinterest_source/pull/31) includes the following updates:
+## Bug Fixes
+- This package now leverages the new `pinterest_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_pinterest_source v0.10.0
 [PR #28](https://github.com/fivetran/dbt_pinterest_source/pull/28) includes the following updates:
 

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'pinterest_source'
-version: '0.10.0'
+version: '0.10.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: 'pinterest_source_integration_tests'
-version: '0.10.0'
+version: '0.10.1'
 profile: 'integration_tests'
 config-version: 2
 

diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt
@@ -1,7 +1,7 @@
 dbt-snowflake>=1.3.0,<2.0.0
 dbt-bigquery>=1.3.0,<2.0.0
-dbt-redshift>=1.3.0,<1.5.0
+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
diff --git a/macros/pinterest_ads_extract_url_parameters.sql b/macros/pinterest_ads_extract_url_parameters.sql
@@ -0,0 +1,20 @@
+{% macro pinterest_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ return(adapter.dispatch('pinterest_ads_extract_url_parameter', 'pinterest_source') (field, url_parameter)) }}
+
+{% endmacro %}
+
+
+{% macro default__pinterest_ads_extract_url_parameter(field, url_parameter) -%}
+
+{{ dbt_utils.get_url_parameter(field, url_parameter) }}
+
+{%- endmacro %}
+
+
+{% macro spark__pinterest_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/stg_pinterest_ads__pin_promotion_history.sql b/models/stg_pinterest_ads__pin_promotion_history.sql
@@ -37,11 +37,11 @@ final as (
         {{ dbt.split_part('destination_url', "'?'", 1) }} as base_url,
         {{ dbt_utils.get_url_host('destination_url') }} as url_host,
         '/' || {{ dbt_utils.get_url_path('destination_url') }} as url_path,
-        {{ dbt_utils.get_url_parameter('destination_url', 'utm_source') }} as utm_source,
-        {{ dbt_utils.get_url_parameter('destination_url', 'utm_medium') }} as utm_medium,
-        {{ dbt_utils.get_url_parameter('destination_url', 'utm_campaign') }} as utm_campaign,
-        {{ dbt_utils.get_url_parameter('destination_url', 'utm_content') }} as utm_content,
-        {{ dbt_utils.get_url_parameter('destination_url', 'utm_term') }} as utm_term,
+        {{ pinterest_source.pinterest_ads_extract_url_parameter('destination_url', 'utm_source') }} as utm_source,
+        {{ pinterest_source.pinterest_ads_extract_url_parameter('destination_url', 'utm_medium') }} as utm_medium,
+        {{ pinterest_source.pinterest_ads_extract_url_parameter('destination_url', 'utm_campaign') }} as utm_campaign,
+        {{ pinterest_source.pinterest_ads_extract_url_parameter('destination_url', 'utm_content') }} as utm_content,
+        {{ pinterest_source.pinterest_ads_extract_url_parameter('destination_url', 'utm_term') }} as utm_term,
         name as pin_name,
         pin_id,
         status as pin_status,