Merge pull request #40 from fivetran/bugfix/opportunity-model-passthr…

…ough Bugfix/opportunity model passthrough
fivetran · May 16, 2023 · 274f24c · 274f24c
2 parents 357b1cb + 7d95bc7
commit 274f24c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# dbt_salesforce v0.9.1
+## Bug Fixes
+[PR #40](https://github.com/fivetran/dbt_salesforce/pull/40) includes the following bug fixes.
+- The `salesforce__opportunity_pass_through_columns` passthrough variable config has been removed from the `salesforce__opportunity_enhanced` to ensure duplicate columns are not introduced when leveraging the opportunity passthrough functionality.
+  - When using the `salesforce__opportunity_pass_through_columns` variable, you will still see the results populated in the `salesforce__opportunity_enhanced`. The fields are already introduced via the `opportunity.*` in the select statement. 
+
 # dbt_salesforce v0.9.0
 
 ## 🚨 Breaking Changes 🚨:

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,6 +1,6 @@
 config-version: 2
 name: 'salesforce'
-version: '0.9.0'
+version: '0.9.1'
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 models:
   salesforce:
@@ -37,3 +37,4 @@ clean-targets:
 - target
 - dbt_modules
 - dbt_packages
+
diff --git a/docs/catalog.json b/docs/catalog.json
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/.gitignore b/integration_tests/.gitignore
@@ -2,3 +2,4 @@
 target/
 dbt_modules/
 logs/
+env/
diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'salesforce_integration_tests'
-version: '0.9.0'
+version: '0.9.1'
 config-version: 2
 
 profile: 'integration_tests'

diff --git a/models/salesforce__opportunity_enhanced.sql b/models/salesforce__opportunity_enhanced.sql
@@ -69,7 +69,6 @@ add_fields as (
         case when is_closed_this_quarter then 1 else 0 end as closed_count_this_quarter
 
         --The below script allows for pass through columns.
-        {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='salesforce__opportunity_pass_through_columns', identifier='opportunity') }}
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='salesforce__account_pass_through_columns', identifier='account') }}
         {{ custom_persist_pass_through_columns(pass_through_variable='salesforce__user_pass_through_columns', identifier='opportunity_owner', append_string= '_owner') }}
         {{ custom_persist_pass_through_columns(pass_through_variable='salesforce__user_pass_through_columns', identifier='opportunity_manager', append_string= '_manager') }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     target/
     dbt_modules/
     logs/
+    env/