use macro

CHANGELOG.md

@@ -13,6 +13,10 @@ Introducing...conversion metrics ([PR #43](https://github.com/fivetran/dbt_faceb
 - Updated the `quickstart.yml` file to allow for automated Quickstart data model deployments ([PR #40](https://github.com/fivetran/dbt_facebook_ads/pull/40)).
 - Updated the PR templates to align with our most up-to-date standards ([PR #43](https://github.com/fivetran/dbt_facebook_ads/pull/43)).
 
+## Contributors
+[Seer Interactive](https://www.seerinteractive.com/)
+<More to be added>
+
 # dbt_facebook_ads v0.7.2
 
 [PR #38](https://github.com/fivetran/dbt_facebook_ads/pull/38) includes the following updates: 

macros/facebook_ads_persist_pass_through_columns.sql

@@ -0,0 +1,11 @@
+{# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces #}
+
+{% macro facebook_ads_persist_pass_through_columns(pass_through_variable, identifier=none, transform='', coalesce_with=none) %}
+
+{% if var(pass_through_variable, none) %}
+    {% for field in var(pass_through_variable) %}
+        , {{ transform ~ '(' ~ ('coalesce(' if coalesce_with is not none else '') ~ (identifier ~ '.' if identifier else '') ~ (field.alias if field.alias else field.name) ~ ((', ' ~ coalesce_with ~ ')') if coalesce_with is not none else '') ~ ')' }} as {{ field.alias if field.alias else field.name }}
+    {% endfor %}
+{% endif %}
+
+{% endmacro %}

models/facebook_ads__account_report.sql

@@ -39,13 +39,7 @@ joined as (
         sum(report.spend) as spend
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_passthrough_metrics', transform = 'sum') }}
         , sum(coalesce(conversion_report.conversion_value, 0)) as conversion_value
-
-        {# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces, since the conversion_report is on the right side of a left join #}
-        {% if var('facebook_ads__basic_ad_actions_passthrough_metrics', none) %}
-            {% for field in var('facebook_ads__basic_ad_actions_passthrough_metrics') %}
-                , sum( coalesce({{ field.alias if field.alias else field.name }}, 0)) as {{ field.alias if field.alias else field.name }}
-            {% endfor %}
-        {% endif %}
+        {{ facebook_ads_persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_actions_passthrough_metrics', transform = 'sum', coalesce_with=0) }}
 
     from report 
     left join conversion_report

models/facebook_ads__ad_report.sql

@@ -64,13 +64,7 @@ joined as (
         sum(report.spend) as spend
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_passthrough_metrics', transform = 'sum') }}
         , sum(coalesce(conversion_report.conversion_value, 0)) as conversion_value
-
-        {# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces, since the conversion_report is on the right side of a left join #}
-        {% if var('facebook_ads__basic_ad_actions_passthrough_metrics', none) %}
-            {% for field in var('facebook_ads__basic_ad_actions_passthrough_metrics') %}
-                , sum( coalesce({{ field.alias if field.alias else field.name }}, 0)) as {{ field.alias if field.alias else field.name }}
-            {% endfor %}
-        {% endif %}
+        {{ facebook_ads_persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_actions_passthrough_metrics', transform = 'sum', coalesce_with=0) }}
 
     from report 
     left join conversion_report

models/facebook_ads__ad_set_report.sql

@@ -67,13 +67,8 @@ joined as (
         sum(report.spend) as spend
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_passthrough_metrics', transform = 'sum') }}
         , sum(coalesce(conversion_report.conversion_value, 0)) as conversion_value
-
-        {# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces, since the conversion_report is on the right side of a left join #}
-        {% if var('facebook_ads__basic_ad_actions_passthrough_metrics', none) %}
-            {% for field in var('facebook_ads__basic_ad_actions_passthrough_metrics') %}
-                , sum( coalesce({{ field.alias if field.alias else field.name }}, 0)) as {{ field.alias if field.alias else field.name }}
-            {% endfor %}
-        {% endif %}    
+        {{ facebook_ads_persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_actions_passthrough_metrics', transform = 'sum', coalesce_with=0) }}
+
     from report 
     left join conversion_report
         on report.date_day = conversion_report.date_day

models/facebook_ads__campaign_report.sql

@@ -58,13 +58,7 @@ joined as (
         sum(report.spend) as spend
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_passthrough_metrics', transform = 'sum') }}
         , sum(coalesce(conversion_report.conversion_value, 0)) as conversion_value
-
-        {# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces, since the conversion_report is on the right side of a left join #}
-        {% if var('facebook_ads__basic_ad_actions_passthrough_metrics', none) %}
-            {% for field in var('facebook_ads__basic_ad_actions_passthrough_metrics') %}
-                , sum( coalesce({{ field.alias if field.alias else field.name }}, 0)) as {{ field.alias if field.alias else field.name }}
-            {% endfor %}
-        {% endif %}
+        {{ facebook_ads_persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_actions_passthrough_metrics', transform = 'sum', coalesce_with=0) }}
 
     from report 
     left join conversion_report

models/facebook_ads__url_report.sql

@@ -81,13 +81,7 @@ joined as (
         sum(report.spend) as spend
         {{ fivetran_utils.persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_passthrough_metrics', transform = 'sum') }}
         , sum(coalesce(conversion_report.conversion_value, 0)) as conversion_value
-
-        {# Adapted from fivetran_utils.persist_pass_through_columns() macro to include coalesces, since the conversion_report is on the right side of a left join #}
-        {% if var('facebook_ads__basic_ad_actions_passthrough_metrics', none) %}
-            {% for field in var('facebook_ads__basic_ad_actions_passthrough_metrics') %}
-                , sum( coalesce({{ field.alias if field.alias else field.name }}, 0)) as {{ field.alias if field.alias else field.name }}
-            {% endfor %}
-        {% endif %}
+        {{ facebook_ads_persist_pass_through_columns(pass_through_variable='facebook_ads__basic_ad_actions_passthrough_metrics', transform = 'sum', coalesce_with=0) }}
 
     from report
     left join conversion_report