Merge pull request #11 from fivetran/bug/default-cols

bug/default-cols
fivetran · Nov 27, 2023 · 65c994d · 65c994d
2 parents 101c1c1 + e9874d7
commit 65c994d
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 44 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ target/
 dbt_modules/
 logs/   
 dbt_packages/
-env/
+env/
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# dbt_zuora_source v0.2.1
+[PR #11](https://github.com/fivetran/dbt_zuora_source/pull/11) includes the following update:
+## 🔧 Bug Fixes
+- Updated default column macros to remove columns not used in their associated staging models. This prevents conflicts when bringing in this columns via the passthrough functionality.
+
 # dbt_zuora_source v0.2.0
 [PR #9](https://github.com/fivetran/dbt_zuora_source/pull/9) includes the following update:
 
@@ -45,4 +50,4 @@ This package is designed to enrich your Fivetran Zuora data by doing the followi
 - Model staging tables which leverage data in the format described [here](https://fivetran.com/docs/applications/zuora#schemainformation), which can then be used simultaneously with our [Zuora modeling transformation package](https://github.com/fivetran/dbt_zuora).
 - Currently the package supports Postgres, Redshift, BigQuery, Databricks, and Snowflake. Additionally, this package is designed to work with dbt versions [">=1.3.0", "<2.0.0"].
 
-For more information refer to the [README](https://github.com/fivetran/dbt_zuora_source/blob/main/README.md).
+For more information refer to the [README](https://github.com/fivetran/dbt_zuora_source/blob/main/README.md).
diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'zuora_source'
-version: '0.2.0'
+version: '0.2.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: 'zuora_source_integration_tests'
-version: '0.2.0'
+version: '0.2.1'
 config-version: 2
 profile: 'integration_tests'
 

diff --git a/integration_tests/seeds/zuora_amendment_data.csv b/integration_tests/seeds/zuora_amendment_data.csv
@@ -1,6 +1,7 @@
-id,_fivetran_deleted,_fivetran_synced,auto_renew,booking_date,code,contract_effective_date,created_by_id,created_date,current_term,current_term_period_type,customer_acceptance_date,description,effective_date,effective_policy,name,new_rate_plan_id,removed_rate_plan_id,renewal_setting,renewal_term,renewal_term_period_type,resume_date,service_activation_date,specific_update_date,status,sub_type,subscription_id,suspend_date,term_start_date,term_type,type,updated_by_id,updated_date
-8ad090b982afa5530182afc61ca7353b,FALSE,2023-02-20 17:54:58.299000,,2022-08-18,A-AM00000063,2022-08-17,3,2022-08-18 07:06:12.000000,,Month,2022-08-17,,2022-08-17,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-08-17,,Completed,,8ad0887182aa6f680182ac9dcaba14c3,,,,Renewal,3,2022-08-18 07:06:12.000000
-8ad094b67e0ea9e2017e16fca03801a2,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000057,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08576b7e5ae0176bf3993d841d9,,,,Renewal,3,2022-01-01 18:52:42.000000
-8ad094b67e0ea9e2017e16fca20802bd,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000060,2022-01-01,3,2022-01-01 18:52:42.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08676b7f0ee0176bf3993d164c3,,,,Renewal,3,2022-01-01 18:52:42.000000
-8ad08c4c7e0e9d83017e16fca09803e7,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000058,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08576b7e5ae0176bf39950142d2,,,,Renewal,3,2022-01-01 18:52:42.000000
-8ad094b67e0ea9e2017e16fca0070168,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000056,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08576b7e5ae0176bf3993d141d1,,,,Renewal,3,2022-01-01 18:52:41.000000
+id,_fivetran_deleted,_fivetran_synced,auto_renew,booking_date,code,contract_effective_date,created_by_id,created_date,current_term,current_term_period_type,customer_acceptance_date,description,effective_date,effective_policy,name,new_rate_plan_id,removed_rate_plan_id,renewal_setting,renewal_term,renewal_term_period_type,resume_date,service_activation_date,specific_update_date,status,sub_type,subscription_id,suspend_date,term_start_date,term_type,type,updated_by_id,updated_date
+8ad090b982afa5530182afc61ca7353b,FALSE,2023-02-20 17:54:58.299000,,2022-08-18,A-AM00000063,2022-08-17,3,2022-08-18 07:06:12.000000,,Month,2022-08-17,,2022-08-17,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-08-17,,Completed,,8ad0887182aa6f680182ac9dcaba14c3,,,,Renewal,3,2022-08-18 07:06:12.000000
+8ad094b67e0ea9e2017e16fca03801a2,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000057,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08576b7e5ae0176bf3993d841d9,,,,Renewal,3,2022-01-01 18:52:42.000000
+8ad094b67e0ea9e2017e16fca20802bd,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000060,2022-01-01,3,2022-01-01 18:52:42.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08676b7f0ee0176bf3993d164c3,,,,Renewal,3,2022-01-01 18:52:42.000000
+8ad08c4c7e0e9d83017e16fca09803e7,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000058,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,2c92c08576b7e5ae0176bf39950142d2,,,,Renewal,3,2022-01-01 18:52:42.000000
+8ad094b67e0ea9e2017e16fca0070168,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000056,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,8ad0877b8262bc1e018263418ba12451,,,,Renewal,3,2022-01-01 18:52:41.000000
+8ad094b67e0ea9e2017e16fca0070169,FALSE,2023-02-20 17:54:24.172000,,2022-01-01,A-AM00000056,2022-01-01,3,2022-01-01 18:52:41.000000,,Month,2022-01-01,,2022-01-01,,Auto-generated Renewal Amendment,,,RENEW_WITH_SPECIFIC_TERM,,Month,,2022-01-01,,Completed,,8ad0877b8262bc1e018263418ba12451,,,,Renewal,3,2022-01-01 18:52:41.000000
diff --git a/integration_tests/seeds/zuora_taxation_item_data.csv b/integration_tests/seeds/zuora_taxation_item_data.csv
@@ -1,6 +1,7 @@
-id,_fivetran_deleted,_fivetran_synced,account_id,account_receivable_accounting_code_id,accounting_code,accounting_period_id,amendment_id,balance,bill_to_contact_id,created_by_id,created_date,credit_amount,default_payment_method_id,exchange_rate,exchange_rate_date,exempt_amount,exempt_amount_currency_rounding,exempt_amount_home_currency,home_currency,invoice_id,invoice_item_id,journal_entry_id,journal_run_id,jurisdiction,location_code,name,payment_amount,product_id,product_rate_plan_charge_id,product_rate_plan_id,provider_exchange_rate_date,rate_plan_charge_id,rate_plan_id,sales_tax_payable_accounting_code_id,sold_to_contact_id,subscription_id,tax_amount,tax_amount_currency_rounding,tax_amount_home_currency,tax_code,tax_code_description,tax_date,tax_mode,tax_rate,tax_rate_description,tax_rate_type,transaction_currency,updated_by_id,updated_date,parent_account_id,seller_registration,tax_description,customer_code,tax_rule_id,exempt_certificate
-dff38ac095012f19007b8a0942416110,TRUE,2021-03-10 05:22:53.999000,,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,10150,,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 16:42:00.000000,0,,,,0,,,USD,,,,,,,VAT,0,,,,,,,dff38ac0fba604680e05975d38ab9a17,,,10150,,,Z-Tax Code,,2015-01-01 00:00:00.000000,TaxExclusive,0.2,VAT,Percentage,,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 16:42:26.000000,,,,,,
-dff38ac03b24a6efd976ad1221ebd5cc,FALSE,2023-02-20 11:52:51.825000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:03:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-03-01 00:00:00.000000,0,,,USD,dff38ac0eca698fe16b7bbcbee1bde9a,dff38ac045956113a171540c9140fc0b,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-02-28 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-03-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:03:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
-dff38ac000b51d4f7da576428e87153c,FALSE,2023-02-20 11:52:51.817000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 20:26:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-01-01 00:00:00.000000,0,,,USD,dff38ac0a8a6524d63e0370d7f4efa90,dff38ac069a6c4b2c92fd1f7c814af0b,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac0ae3a380c200ca2ff2c03c446,dff38ac032dff92883a7db5399749907,2014-12-31 00:00:00.000000,dff38ac0cda02c2b3e20b3e263ba1d87,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-01-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 20:26:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
-dff38ac02de217d2778e4a14040f7962,FALSE,2023-02-20 11:52:51.824000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:00:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-02-01 00:00:00.000000,0,,,USD,dff38ac0b66ab2525419e5f4a974833e,dff38ac09b98dcff96551798e0826226,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-01-31 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-02-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:00:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
-dff38ac009f6a993e2dde174c3f6d96b,FALSE,2023-02-20 11:52:51.827000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-04-01 00:00:00.000000,0,,,USD,dff38ac04b24b28ec26519e090021305,dff38ac00630f38bc30c4dd591f9aa96,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-03-31 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-04-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
+id,_fivetran_deleted,_fivetran_synced,account_id,account_receivable_accounting_code_id,accounting_code,accounting_period_id,amendment_id,balance,bill_to_contact_id,created_by_id,created_date,credit_amount,default_payment_method_id,exchange_rate,exchange_rate_date,exempt_amount,exempt_amount_currency_rounding,exempt_amount_home_currency,home_currency,invoice_id,invoice_item_id,journal_entry_id,journal_run_id,jurisdiction,location_code,name,payment_amount,product_id,product_rate_plan_charge_id,product_rate_plan_id,provider_exchange_rate_date,rate_plan_charge_id,rate_plan_id,sales_tax_payable_accounting_code_id,sold_to_contact_id,subscription_id,tax_amount,tax_amount_currency_rounding,tax_amount_home_currency,tax_code,tax_code_description,tax_date,tax_mode,tax_rate,tax_rate_description,tax_rate_type,transaction_currency,updated_by_id,updated_date,parent_account_id,seller_registration,tax_description,customer_code,tax_rule_id,exempt_certificate
+dff38ac095012f19007b8a0942416110,TRUE,2021-03-10 05:22:53.999000,,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,10150,,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 16:42:00.000000,0,,,,0,,,USD,,,,,,,VAT,0,,,,,,,dff38ac0fba604680e05975d38ab9a17,,,10150,,,Z-Tax Code,,2015-01-01 00:00:00.000000,TaxExclusive,0.2,VAT,Percentage,,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 16:42:26.000000,,,,,,
+dff38ac03b24a6efd976ad1221ebd5cc,FALSE,2023-02-20 11:52:51.825000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:03:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-03-01 00:00:00.000000,0,,,USD,dff38ac0eca698fe16b7bbcbee1bde9a,dff38ac045956113a171540c9140fc0b,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-02-28 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-03-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:03:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
+dff38ac000b51d4f7da576428e87153c,FALSE,2023-02-20 11:52:51.817000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 20:26:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-01-01 00:00:00.000000,0,,,USD,dff38ac0a8a6524d63e0370d7f4efa90,dff38ac069a6c4b2c92fd1f7c814af0b,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac0ae3a380c200ca2ff2c03c446,dff38ac032dff92883a7db5399749907,2014-12-31 00:00:00.000000,dff38ac0cda02c2b3e20b3e263ba1d87,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-01-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 20:26:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
+dff38ac02de217d2778e4a14040f7962,FALSE,2023-02-20 11:52:51.824000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:00:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-02-01 00:00:00.000000,0,,,USD,dff38ac0b66ab2525419e5f4a974833e,dff38ac09b98dcff96551798e0826226,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-01-31 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-02-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:00:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
+dff38ac009f6a993e2dde174c3f6d96b,FALSE,2023-02-20 11:52:51.827000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-04-01 00:00:00.000000,0,,,USD,dff38ac04b24b28ec26519e090021305,2c92c0946763f3ca01678229905f2f7d,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-03-31 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-04-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
+dff38ac009f6a993e2dde174c3f6d96c,FALSE,2023-02-20 11:52:51.827000,dff38ac0e5e1b210b55e785af668c300,dff38ac0507cfccf7b1585994a315868,Sales Tax Payable,,,0,dff38ac0fd532ffb3826262a658a6fe8,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,0,dff38ac029b398b9e5bb9ab74146ed1e,,2015-04-01 00:00:00.000000,0,,,USD,dff38ac04b24b28ec26519e090021306,2c92c0946763f3ca01678229905f2f7d,,,<nomatch>,,,0,dff38ac02ade9f01dbc96060cfab6cf9,dff38ac08f2704eb2cdd3bff320e8594,dff38ac032dff92883a7db5399749907,2015-03-31 00:00:00.000000,dff38ac07ea570aa8525a64379f56424,dff38ac0ca6da277c35df02c5c739912,dff38ac0fba604680e05975d38ab9a17,dff38ac0fd532ffb3826262a658a6fe8,dff38ac026d258785c36ba01d599cb32,0,,,Z-Tax Code,,2015-04-01 00:00:00.000000,TaxExclusive,0,,,EUR,dff38ac0c94b11b94a7a297293d10e08,2016-01-15 23:04:00.000000,dff38ac0e09e5a914e7cddb66f92e2af,,,,,
diff --git a/macros/get_account_columns.sql b/macros/get_account_columns.sql
@@ -29,8 +29,6 @@
     {"name": "tax_exempt_status", "datatype": dbt.type_string()}, 
     {"name": "total_debit_memo_balance", "datatype": dbt.type_float()},
     {"name": "total_invoice_balance", "datatype": dbt.type_float()},
-    {"name": "unapplied_balance", "datatype": dbt.type_float()},
-    {"name": "unapplied_credit_memo_amount", "datatype": dbt.type_float()},
     {"name": "updated_by_id", "datatype": dbt.type_string()},
     {"name": "updated_date", "datatype": dbt.type_timestamp()},
     {"name": "vatid", "datatype": dbt.type_string()}

diff --git a/macros/get_credit_balance_adjustment_columns.sql b/macros/get_credit_balance_adjustment_columns.sql
@@ -14,7 +14,6 @@
     {"name": "comment", "datatype": dbt.type_string()},
     {"name": "created_by_id", "datatype": dbt.type_string()},
     {"name": "created_date", "datatype": dbt.type_timestamp()},
-    {"name": "customer_cash_on_account_accounting_code_id", "datatype": dbt.type_string()},
     {"name": "default_payment_method_id", "datatype": dbt.type_string()},
     {"name": "exchange_rate", "datatype": dbt.type_float()},
     {"name": "exchange_rate_date", "datatype": "date"},

diff --git a/macros/get_invoice_columns.sql b/macros/get_invoice_columns.sql
@@ -43,7 +43,6 @@
     {"name": "target_date", "datatype": "date"},
     {"name": "tax_amount", "datatype": dbt.type_float()},
     {"name": "tax_status", "datatype": dbt.type_string()},
-    {"name": "template_id", "datatype": dbt.type_string()},
     {"name": "transaction_currency", "datatype": dbt.type_string()},
     {"name": "transferred_to_accounting", "datatype": dbt.type_string()},
     {"name": "updated_by_id", "datatype": dbt.type_string()},

diff --git a/macros/get_invoice_item_columns.sql b/macros/get_invoice_item_columns.sql
@@ -16,7 +16,6 @@
     {"name": "charge_name", "datatype": dbt.type_string()},
     {"name": "created_by_id", "datatype": dbt.type_string()},
     {"name": "created_date", "datatype": dbt.type_timestamp()},
-    {"name": "default_payment_method_id", "datatype": dbt.type_string()},
     {"name": "deferred_revenue_accounting_code_id", "datatype": dbt.type_string()},
     {"name": "exchange_rate", "datatype": dbt.type_float()},
     {"name": "exchange_rate_date", "datatype": "date"},

diff --git a/macros/get_product_rate_plan_charge_columns.sql b/macros/get_product_rate_plan_charge_columns.sql
@@ -30,7 +30,6 @@
     {"name": "name", "datatype": dbt.type_string()},  
     {"name": "product_id", "datatype": dbt.type_string()},
     {"name": "product_rate_plan_id", "datatype": dbt.type_string()},
-    {"name": "recognized_revenue_accounting_code_id", "datatype": dbt.type_string()},  
     {"name": "specific_billing_period", "datatype": dbt.type_int()},  
     {"name": "tax_mode", "datatype": dbt.type_string()},
     {"name": "taxable", "datatype": "boolean"},

diff --git a/macros/get_rate_plan_charge_columns.sql b/macros/get_rate_plan_charge_columns.sql
@@ -63,7 +63,6 @@
     {"name": "specific_end_date", "datatype": "date"},
     {"name": "specific_list_price_base", "datatype": dbt.type_int()},
     {"name": "subscription_id", "datatype": dbt.type_string()},
-    {"name": "subscription_owner_id", "datatype": dbt.type_string()},
     {"name": "tcv", "datatype": dbt.type_float()}, 
     {"name": "tcvhome_currency", "datatype": dbt.type_float()},
     {"name": "transaction_currency", "datatype": dbt.type_string()},

diff --git a/macros/get_refund_columns.sql b/macros/get_refund_columns.sql
@@ -12,8 +12,6 @@
     {"name": "id", "datatype": dbt.type_string()}, 
     {"name": "method_type", "datatype": dbt.type_string()},
     {"name": "payment_method_id", "datatype": dbt.type_string()}, 
-    {"name": "reason_code", "datatype": dbt.type_string()},
-    {"name": "reference_id", "datatype": dbt.type_string()},
     {"name": "refund_date", "datatype": "date"},
     {"name": "refund_number", "datatype": dbt.type_string()},
     {"name": "refund_transaction_time", "datatype": dbt.type_timestamp()},