Merge pull request #8 from fivetran/MagicBot/package-extract-url-para…

…meters

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

@@ -2,5 +2,6 @@
 target/
 dbt_modules/
 logs/
-
-dbt_packages/
+env/
+dbt_packages/
+package-lock.yml

CHANGELOG.md

@@ -1,3 +1,12 @@
+# dbt_reddit_ads v0.2.1
+
+[PR #8](https://github.com/fivetran/dbt_reddit_ads/pull/8) includes the following updates:
+## Bug Fixes
+- This package now leverages the new `reddit_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_reddit_ads v0.2.0
 [PR #5](https://github.com/fivetran/dbt_reddit_ads/pull/5) includes the following updates:
 ## Feature update 🎉

dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'reddit_ads'
-version: '0.2.0'
+version: '0.2.1'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:

integration_tests/ci/sample.profiles.yml

@@ -16,13 +16,13 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: reddit_ads_integration_tests_1
+      schema: reddit_ads_integration_tests_3
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: reddit_ads_integration_tests_1
+      schema: reddit_ads_integration_tests_3
       threads: 8
       keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}"
     snowflake:
@@ -33,7 +33,7 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: reddit_ads_integration_tests_1
+      schema: reddit_ads_integration_tests_3
       threads: 8
     postgres:
       type: postgres
@@ -42,13 +42,13 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: reddit_ads_integration_tests_1
+      schema: reddit_ads_integration_tests_3
       threads: 8
     databricks:
       catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}"
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: reddit_ads_integration_tests_1
+      schema: reddit_ads_integration_tests_3
       threads: 8
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks

integration_tests/dbt_project.yml

@@ -1,10 +1,10 @@
 name: 'reddit_ads_integration_tests'
-version: '0.2.0'
+version: '0.2.1'
 profile: 'integration_tests'
 config-version: 2
 
 vars: 
-  reddit_ads_schema: reddit_ads_integration_tests_1
+  reddit_ads_schema: reddit_ads_integration_tests_3
   reddit_ads_account_identifier: "reddit_ads_account_data"
   reddit_ads_account_report_identifier: "reddit_ads_account_report_data"
   reddit_ads_ad_identifier: "reddit_ads_ad_data"

macros/reddit_ads_extract_url_parameters.sql

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

models/reddit_ads__url_report.sql

@@ -49,11 +49,11 @@ joined as (
         {{ dbt.split_part('ads.click_url', "'?'", 1) }} as base_url,
         {{ dbt_utils.get_url_host('ads.click_url') }} as url_host,
         '/' || {{ dbt_utils.get_url_path('ads.click_url') }} as url_path,
-        {{ dbt_utils.get_url_parameter('ads.click_url', 'utm_source') }} as utm_source,
-        {{ dbt_utils.get_url_parameter('ads.click_url', 'utm_medium') }} as utm_medium,
-        {{ dbt_utils.get_url_parameter('ads.click_url', 'utm_term') }} as utm_term,
-        {{ dbt_utils.get_url_parameter('ads.click_url', 'utm_content') }} as utm_content,
-        coalesce( {{ dbt_utils.get_url_parameter('ads.click_url', 'utm_campaign') }}, campaigns.campaign_name) as utm_campaign,
+        {{ reddit_ads.reddit_ads_extract_url_parameter('ads.click_url', 'utm_source') }} as utm_source,
+        {{ reddit_ads.reddit_ads_extract_url_parameter('ads.click_url', 'utm_medium') }} as utm_medium,
+        {{ reddit_ads.reddit_ads_extract_url_parameter('ads.click_url', 'utm_term') }} as utm_term,
+        {{ reddit_ads.reddit_ads_extract_url_parameter('ads.click_url', 'utm_content') }} as utm_content,
+        coalesce( {{ reddit_ads.reddit_ads_extract_url_parameter('ads.click_url', 'utm_campaign') }}, campaigns.campaign_name) as utm_campaign,
         sum(report.clicks) as clicks,
         sum(report.impressions) as impressions,
         sum(report.spend) as spend