Merge pull request #42 from fivetran/bugfix/search-term-passthrough

bugfix/search-term-passthrough
fivetran · May 25, 2023 · 6c4c1ef · 6c4c1ef
2 parents 2b5e2dc + 06ba71b
commit 6c4c1ef
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
-# dbt_apple_search_ads_source v0.UPDATE.UPDATE
-
- ## Under the Hood:
-
-- Incorporated the new `fivetran_utils.drop_schemas_automation` macro into the end of each Buildkite integration test job.
-- Updated the pull request [templates](/.github).
+# dbt_apple_search_ads_source v0.2.2
+## Bug Fix
+- The `apple_search_ads__search_term_passthrough_metrics` variable was moved to be within the return call of the `get_search_term_report_columns` macro. The previous placement caused an issue where the passthrough metrics would not properly persist to downstream models. ([PR #42](https://github.com/fivetran/dbt_apple_search_ads_source/pull/42))
+## Under the Hood:
+- Incorporated the new `fivetran_utils.drop_schemas_automation` macro into the end of each Buildkite integration test job. ([PR #40](https://github.com/fivetran/dbt_apple_search_ads_source/pull/40))
+- Updated the pull request [templates](/.github). ([PR #40](https://github.com/fivetran/dbt_apple_search_ads_source/pull/40))
 # dbt_apple_search_ads_source v0.2.1
 
 ## 🕷️ Bugfixes 🕷️

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'apple_search_ads_source'
-version: '0.2.1'
+version: '0.2.2'
 
 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/ci/sample.profiles.yml b/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: apple_ads_source_integrations_tests
+      schema: apple_ads_source_integrations_tests_1
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: apple_ads_source_integrations_tests
+      schema: apple_ads_source_integrations_tests_1
       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: apple_ads_source_integrations_tests
+      schema: apple_ads_source_integrations_tests_1
       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: apple_ads_source_integrations_tests
+      schema: apple_ads_source_integrations_tests_1
       threads: 8
     databricks:
       catalog: null
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: apple_ads_source_integrations_tests
+      schema: apple_ads_source_integrations_tests_1
       threads: 2
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,12 +1,12 @@
 config-version: 2
 
 name: 'apple_search_ads_source_integration_tests'
-version: '0.2.1'
+version: '0.2.2'
 
 profile: 'integration_tests' 
 
 vars:
-  apple_search_ads_schema: apple_ads_source_integrations_tests
+  apple_search_ads_schema: apple_ads_source_integrations_tests_1
   apple_search_ads_organization_identifier: "organization_data"
   apple_search_ads_campaign_history_identifier: "campaign_history_data"
   apple_search_ads_campaign_report_identifier: "campaign_report_data"

diff --git a/macros/get_search_term_report_columns.sql b/macros/get_search_term_report_columns.sql
@@ -24,8 +24,8 @@
     {"name": "taps", "datatype": dbt.type_int()}
 ] %}
 
-{{ return(columns) }}
-
 {{ fivetran_utils.add_pass_through_columns(columns, var('apple_search_ads__search_term_passthrough_metrics')) }}
 
+{{ return(columns) }}
+
 {% endmacro %}