Merge pull request #33 from fivetran/customer/passthrough_fix

Customer/passthrough fix
fivetran · Aug 25, 2022 · 6bdfbec · 6bdfbec
2 parents 305474f + ce635e5
commit 6bdfbec
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# dbt_salesforce v0.7.1
+## Features
+  - Resolving bug in `salesforce__contact_enhanced` when using user passthrough columns.
+  - Resolving bug in `salesforce__opportunity_line_item_enhanced` when using user passthrough columns.  
+
+## Contributors
+- [@calder-holt](https://github.com/calder-holt) ([#32](https://github.com/fivetran/dbt_salesforce/pull/32))
+
 # dbt_salesforce v0.7.0
 🎉 Salesforce Package Updates 🎉
 

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,6 +1,6 @@
 config-version: 2
 name: 'salesforce'
-version: '0.7.0'
+version: '0.7.1'
 require-dbt-version: [">=1.0.0", "<2.0.0"]
 models:
   salesforce:

diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml
@@ -16,14 +16,14 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: salesforce_integration_tests_3
+      schema: salesforce_integration_tests_4
       threads: 8
     bigquery:
       type: bigquery
       method: service-account
       keyfile: "{{ env_var('GCLOUD_SERVICE_KEY_PATH') }}"
       project: 'dbt-package-testing'
-      schema: salesforce_integration_tests_3
+      schema: salesforce_integration_tests_4
       threads: 8
     snowflake:
       type: 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: salesforce_integration_tests_3
+      schema: salesforce_integration_tests_4
       threads: 8
     postgres:
       type: postgres
@@ -42,12 +42,12 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: salesforce_integration_tests_3
+      schema: salesforce_integration_tests_4
       threads: 8
     spark:
       type: spark
       method: http
-      schema: salesforce_integration_tests_3
+      schema: salesforce_integration_tests_4
       host: "{{ env_var('CI_SPARK_DBT_HOST') }}"
       organization: "{{ env_var('CI_SPARK_DBT_ORGANIZATION') }}"
       token: "{{ env_var('CI_SPARK_DBT_TOKEN') }}"

diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'salesforce_integration_tests'
-version: '0.7.0'
+version: '0.7.1'
 config-version: 2
 
 profile: 'integration_tests'
@@ -24,7 +24,7 @@ vars:
     salesforce_product_2_identifier: "sf_product_2_data"
     salesforce_order_identifier: "sf_order_data"
     salesforce_opportunity_line_item_identifier: "sf_opportunity_line_item_data"
-    salesforce_schema: salesforce_integration_tests_3
+    salesforce_schema: salesforce_integration_tests_4
 
 seeds:
   salesforce_integration_tests:

diff --git a/models/salesforce__contact_enhanced.sql b/models/salesforce__contact_enhanced.sql
@@ -55,17 +55,17 @@ select
 
         --The below scripts allows for pass through columns.
     {% if var('contact_pass_through_columns',[]) != [] %}
-    , {{ var('contact_pass_through_columns') | join (", contact.")}}
+    , contact.{{ var('contact_pass_through_columns') | join (", contact.")}}
 
     {% endif %}
 
     {% if var('account_pass_through_columns',[]) != [] %}
-    , {{ var('account_pass_through_columns') | join (", account.")}}
+    , account.{{ var('account_pass_through_columns') | join (", account.")}}
 
     {% endif %}
 
     {% if var('user_pass_through_columns',[]) != [] %}
-    , {{ var('user_pass_through_columns') | join (", user.")}}
+    , salesforce_user.{{ var('user_pass_through_columns') | join (", salesforce_user.")}}
 
     {% endif %}
 

diff --git a/models/salesforce__opportunity_line_item_enhanced.sql b/models/salesforce__opportunity_line_item_enhanced.sql
@@ -58,12 +58,12 @@ final as (
 
         --The below script allows for pass through columns.
         {% if var('opportunity_line_item_pass_through_columns',[]) != [] %}
-        , {{ var('opportunity_line_item_pass_through_columns') | join (", oli.")}}
+        , oli.{{ var('opportunity_line_item_pass_through_columns') | join (", oli.")}}
 
         {% endif %}
 
         {% if var('product_2_pass_through_columns',[]) != [] %}
-        , {{ var('product_2_pass_through_columns') | join (", product_2.")}}
+        , product_2.{{ var('product_2_pass_through_columns') | join (", product_2.")}}
 
         {% endif %}