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

…ameters Extract URL Parameter Macro Update
fivetran · Dec 14, 2023 · 7cabf7d · 7cabf7d
2 parents fe04117 + 1b04649
commit 7cabf7d
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 13 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,6 @@
-
+package-lock.yml
 target/
 dbt_modules/
 logs/
-
+env/
 dbt_packages/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# dbt_google_ads v0.10.1
+[PR #62](https://github.com/fivetran/dbt_google_ads/pull/62) includes the following updates: 
+
+## Bug Fixes 
+- This package now leverages the new `google_ads_extract_url_parameter()` (located within the dbt_google_ads_source package) 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_google_ads v0.10.0
 [PR #52](https://github.com/fivetran/dbt_google_ads/pull/52) includes the following updates:
 ## Feature update 🎉

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

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: 'google_ads_integration_tests'
-version: '0.10.0'
+version: '0.10.1'
 
 profile: 'integration_tests'
 config-version: 2

diff --git a/models/google_ads__url_report.sql b/models/google_ads__url_report.sql
@@ -53,10 +53,10 @@ fields as (
 
         {% if var('google_auto_tagging_enabled', false) %}
 
-        coalesce( {{ dbt_utils.get_url_parameter('ads.final_url', 'utm_source') }} , 'google')  as utm_source,
-        coalesce( {{ dbt_utils.get_url_parameter('ads.final_url', 'utm_medium') }} , 'cpc') as utm_medium,
-        coalesce( {{ dbt_utils.get_url_parameter('ads.final_url', 'utm_campaign') }} , campaigns.campaign_name) as utm_campaign,
-        coalesce( {{ dbt_utils.get_url_parameter('ads.final_url', 'utm_content') }} , ad_groups.ad_group_name) as utm_content,
+        coalesce( {{ google_ads_source.google_ads_extract_url_parameter('ads.final_url', 'utm_source') }} , 'google')  as utm_source,
+        coalesce( {{ google_ads_source.google_ads_extract_url_parameter('ads.final_url', 'utm_medium') }} , 'cpc') as utm_medium,
+        coalesce( {{ google_ads_source.google_ads_extract_url_parameter('ads.final_url', 'utm_campaign') }} , campaigns.campaign_name) as utm_campaign,
+        coalesce( {{ google_ads_source.google_ads_extract_url_parameter('ads.final_url', 'utm_content') }} , ad_groups.ad_group_name) as utm_content,
 
         {% else %}