Merge pull request #21 from fivetran/bugfix/macro-update

updating macros
fivetran · Sep 6, 2022 · 10d5eb0 · 10d5eb0
2 parents d86fd03 + 817fba5
commit 10d5eb0
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# dbt_apple_search_ads_source v0.1.0
+# dbt_apple_search_ads_source v0.1.2
+
+This [PR #21](https://github.com/fivetran/dbt_apple_search_ads_source/pull/21) updates macros for history tables to only include columns that are referenced downstream.
+# dbt_apple_search_ads_source v0.1.0 - v0.1.1
 
 ## Initial Release
 - This is the initial release of this package. For more information refer to the [README](/README.md).
diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'apple_search_ads_source'
-version: '0.1.0'
+version: '0.1.2'
 config-version: 2
 require-dbt-version: [">=1.0.0", "<2.0.0"]
 

diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml
@@ -1,7 +1,7 @@
 config-version: 2
 
 name: 'apple_search_ads_source_integration_tests'
-version: '0.1.0'
+version: '0.1.2'
 
 profile: 'integration_tests' 
 

diff --git a/macros/get_ad_group_history_columns.sql b/macros/get_ad_group_history_columns.sql
@@ -1,24 +1,14 @@
 {% macro get_ad_group_history_columns() %}
 
 {% set columns = [
-    {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
-    {"name": "automated_keywords_opt_in", "datatype": "boolean"},
     {"name": "campaign_id", "datatype": dbt_utils.type_int()},
-    {"name": "cpa_goal_amount", "datatype": dbt_utils.type_numeric()},
-    {"name": "cpa_goal_currency", "datatype": dbt_utils.type_string()},
-    {"name": "default_cpc_bid_amount", "datatype": dbt_utils.type_numeric()},
-    {"name": "default_cpc_bid_currency", "datatype": dbt_utils.type_string()},
-    {"name": "deleted", "datatype": "boolean"},
     {"name": "end_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "id", "datatype": dbt_utils.type_int()},
     {"name": "modification_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "name", "datatype": dbt_utils.type_string()},
     {"name": "organization_id", "datatype": dbt_utils.type_int()},
-    {"name": "serving_state_reasons", "datatype": dbt_utils.type_string()},
-    {"name": "serving_status", "datatype": dbt_utils.type_string()},
     {"name": "start_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "status", "datatype": dbt_utils.type_string()},
-    {"name": "storefronts", "datatype": dbt_utils.type_string()}
 ] %}
 
 {{ return(columns) }}

diff --git a/macros/get_ad_history_columns.sql b/macros/get_ad_history_columns.sql
@@ -1,18 +1,13 @@
 {% macro get_ad_history_columns() %}
 
 {% set columns = [
-    {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
     {"name": "ad_group_id", "datatype": dbt_utils.type_int()},
     {"name": "campaign_id", "datatype": dbt_utils.type_int()},
     {"name": "creation_time", "datatype": dbt_utils.type_timestamp()},
-    {"name": "creative_id", "datatype": dbt_utils.type_int()},
-    {"name": "creative_type", "datatype": dbt_utils.type_string()},
-    {"name": "deleted", "datatype": "boolean"},
     {"name": "id", "datatype": dbt_utils.type_int()},
     {"name": "modification_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "name", "datatype": dbt_utils.type_string()},
     {"name": "org_id", "datatype": dbt_utils.type_int()},
-    {"name": "serving_status", "datatype": dbt_utils.type_string()},
     {"name": "status", "datatype": dbt_utils.type_string()}
 ] %}
 

diff --git a/macros/get_campaign_history_columns.sql b/macros/get_campaign_history_columns.sql
@@ -1,26 +1,11 @@
 {% macro get_campaign_history_columns() %}
 
 {% set columns = [
-    {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
-    {"name": "adam_id", "datatype": dbt_utils.type_int()},
-    {"name": "budget_amount", "datatype": dbt_utils.type_numeric()},
-    {"name": "budget_currency", "datatype": dbt_utils.type_string()},
-    {"name": "budget_orders", "datatype": dbt_utils.type_string()},
-    {"name": "daily_budget_amount", "datatype": dbt_utils.type_numeric()},
-    {"name": "daily_budget_currency", "datatype": dbt_utils.type_string()},
-    {"name": "deleted", "datatype": "boolean"},
     {"name": "end_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "id", "datatype": dbt_utils.type_int()},
-    {"name": "loc_invoice_detail_buyer_email", "datatype": dbt_utils.type_string()},
-    {"name": "loc_invoice_detail_buyer_name", "datatype": dbt_utils.type_string()},
-    {"name": "loc_invoice_detail_client_name", "datatype": dbt_utils.type_string()},
-    {"name": "loc_invoice_detail_order_number", "datatype": dbt_utils.type_string()},
     {"name": "modification_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "name", "datatype": dbt_utils.type_string()},
     {"name": "organization_id", "datatype": dbt_utils.type_int()},
-    {"name": "payment_model", "datatype": dbt_utils.type_string()},
-    {"name": "serving_state_reasons", "datatype": dbt_utils.type_string()},
-    {"name": "serving_status", "datatype": dbt_utils.type_string()},
     {"name": "start_time", "datatype": dbt_utils.type_timestamp()},
     {"name": "status", "datatype": dbt_utils.type_string()}
 ] %}

diff --git a/macros/get_keyword_history_columns.sql b/macros/get_keyword_history_columns.sql
@@ -1,12 +1,10 @@
 {% macro get_keyword_history_columns() %}
 
 {% set columns = [
-    {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
     {"name": "ad_group_id", "datatype": dbt_utils.type_int()},
     {"name": "bid_amount", "datatype": dbt_utils.type_numeric()},
     {"name": "bid_currency", "datatype": dbt_utils.type_string()},
     {"name": "campaign_id", "datatype": dbt_utils.type_int()},
-    {"name": "deleted", "datatype": "boolean"},
     {"name": "id", "datatype": dbt_utils.type_int()},
     {"name": "match_type", "datatype": dbt_utils.type_string()},
     {"name": "modification_time", "datatype": dbt_utils.type_timestamp()},

diff --git a/macros/get_organization_columns.sql b/macros/get_organization_columns.sql
@@ -1,12 +1,10 @@
 {% macro get_organization_columns() %}
 
 {% set columns = [
-    {"name": "_fivetran_synced", "datatype": dbt_utils.type_timestamp()},
     {"name": "currency", "datatype": dbt_utils.type_string()},
     {"name": "id", "datatype": dbt_utils.type_int()},
     {"name": "name", "datatype": dbt_utils.type_string()},
     {"name": "payment_model", "datatype": dbt_utils.type_string()},
-    {"name": "role_names", "datatype": dbt_utils.type_string()},
     {"name": "time_zone", "datatype": dbt_utils.type_string()}
 ] %}