From f27cc65d72234cf66bdac40797e983fa1705a0ac Mon Sep 17 00:00:00 2001 From: Jeremy Cohen Date: Tue, 6 Jul 2021 21:35:49 -0400 Subject: [PATCH] Upgrade dbt v0.20, dbt-utils v0.7 (#44) * Upgrade dbt v0.20, dbt-utils v0.7 * Update version, company name * Fixups --- README.md | 19 +++++++++++++++---- dbt_project.yml | 4 ++-- .../base/fivetran_fb_ad_creatives.sql | 2 +- .../fivetran/base/fivetran_fb_ad_insights.sql | 2 +- macros/fivetran/base/fivetran_fb_ads.sql | 2 +- .../fivetran/base/fivetran_fb_ads_adsets.sql | 2 +- .../fivetran/base/fivetran_fb_campaigns.sql | 2 +- macros/fivetran/base/fivetran_fb_url_tag.sql | 2 +- macros/fivetran/ignore_nulls.sql | 2 +- macros/get_face.sql | 4 ---- macros/nested_field.sql | 2 +- macros/stitch/base/stitch_fb_ad_creatives.sql | 2 +- .../stitch_fb_ad_creatives__child_links.sql | 4 ++-- macros/stitch/base/stitch_fb_ad_insights.sql | 2 +- macros/stitch/base/stitch_fb_ads.sql | 2 +- macros/stitch/base/stitch_fb_ads_adsets.sql | 2 +- macros/stitch/base/stitch_fb_campaigns.sql | 2 +- packages.yml | 4 ++-- 18 files changed, 34 insertions(+), 27 deletions(-) delete mode 100644 macros/get_face.sql diff --git a/README.md b/README.md index 5dde9e4..b61b5a4 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,23 @@ from Facebook's API. # Installation Instructions [Here](https://docs.getdbt.com/docs/package-management) is some additional -information about packages in dbt, icnluding installation instructions. +information about packages in dbt, including installation instructions. If you haven't already, you will need to create a `packages.yml` file in your project. -You should then copy the adwords package structure from the `dbt_project.yml` in -this repository into your project's `dbt_project.yml` file and replace the `#` -values with the adwords table names from your warehouse. +You should then copy these variables into your root `dbt_project.yml`, and fill in with the names of Facebook ads tables in your warehouse: +``` +vars: + + etl: #stitch or fivetran + ads_table: #table + ad_creatives_table: #table + adsets_table: #table + campaigns_table: #table + ads_insights_table: #table + ad_creatives__child_links_table: #table -- disable if on snowflake + + url_tag_table: #only for fivetran +``` ## Stitch diff --git a/dbt_project.yml b/dbt_project.yml index 764397e..84305ba 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,8 +1,8 @@ name: 'facebook_ads' -version: '0.5.0' +version: '0.7.0' config-version: 2 -require-dbt-version: [">=0.18.0"] +require-dbt-version: [">=0.20.0"] source-paths: ["models"] # paths with source code to compile analysis-paths: ["analysis"] # path with analysis files which are compiled, but not run diff --git a/macros/fivetran/base/fivetran_fb_ad_creatives.sql b/macros/fivetran/base/fivetran_fb_ad_creatives.sql index fcdf22a..a6c5c94 100644 --- a/macros/fivetran/base/fivetran_fb_ad_creatives.sql +++ b/macros/fivetran/base/fivetran_fb_ad_creatives.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_ad_creatives() %} - {{ adapter.dispatch('fivetran_fb_ad_creatives', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('fivetran_fb_ad_creatives', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/base/fivetran_fb_ad_insights.sql b/macros/fivetran/base/fivetran_fb_ad_insights.sql index 14cb0cb..3d34cca 100644 --- a/macros/fivetran/base/fivetran_fb_ad_insights.sql +++ b/macros/fivetran/base/fivetran_fb_ad_insights.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_ad_insights() %} - {{ adapter.dispatch('fivetran_fb_ad_insights', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('fivetran_fb_ad_insights', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/base/fivetran_fb_ads.sql b/macros/fivetran/base/fivetran_fb_ads.sql index 2c50d8b..8e78a89 100644 --- a/macros/fivetran/base/fivetran_fb_ads.sql +++ b/macros/fivetran/base/fivetran_fb_ads.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_ads() %} - {{ adapter.dispatch('fivetran_fb_ads', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('fivetran_fb_ads', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/base/fivetran_fb_ads_adsets.sql b/macros/fivetran/base/fivetran_fb_ads_adsets.sql index 96d8873..23adb2f 100644 --- a/macros/fivetran/base/fivetran_fb_ads_adsets.sql +++ b/macros/fivetran/base/fivetran_fb_ads_adsets.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_ads_adsets() %} - {{ adapter.dispatch('fivetran_fb_ads_adsets', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('fivetran_fb_ads_adsets', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/base/fivetran_fb_campaigns.sql b/macros/fivetran/base/fivetran_fb_campaigns.sql index 99a9798..e649121 100644 --- a/macros/fivetran/base/fivetran_fb_campaigns.sql +++ b/macros/fivetran/base/fivetran_fb_campaigns.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_ads_campaigns() %} - {{ adapter.dispatch('fivetran_fb_ads_campaigns', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('fivetran_fb_ads_campaigns', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/base/fivetran_fb_url_tag.sql b/macros/fivetran/base/fivetran_fb_url_tag.sql index 06a98cf..e4016ee 100644 --- a/macros/fivetran/base/fivetran_fb_url_tag.sql +++ b/macros/fivetran/base/fivetran_fb_url_tag.sql @@ -1,6 +1,6 @@ {% macro fivetran_fb_url_tag() %} - {{adapter.dispatch('fivetran_fb_url_tag', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{adapter.dispatch('fivetran_fb_url_tag', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/fivetran/ignore_nulls.sql b/macros/fivetran/ignore_nulls.sql index 8056963..6734799 100644 --- a/macros/fivetran/ignore_nulls.sql +++ b/macros/fivetran/ignore_nulls.sql @@ -1,6 +1,6 @@ {% macro ignore_nulls() %} - {{ adapter.dispatch('ignore_nulls', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('ignore_nulls', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/get_face.sql b/macros/get_face.sql deleted file mode 100644 index 04f0219..0000000 --- a/macros/get_face.sql +++ /dev/null @@ -1,4 +0,0 @@ -{% macro _get_facebook_ads_namespaces() %} - {% set override_namespaces = var('facebook_ads_dispatch_list', []) %} - {% do return(override_namespaces + ['facebook_ads']) %} -{% endmacro %} diff --git a/macros/nested_field.sql b/macros/nested_field.sql index c336a58..a0cf692 100644 --- a/macros/nested_field.sql +++ b/macros/nested_field.sql @@ -1,6 +1,6 @@ {% macro nested_field(field, subfields) %} - {{ adapter.dispatch('nested_field', packages=facebook_ads._get_facebook_ads_namespaces())(field, subfields) }} + {{ adapter.dispatch('nested_field', 'facebook_ads')(field, subfields) }} {% endmacro %} diff --git a/macros/stitch/base/stitch_fb_ad_creatives.sql b/macros/stitch/base/stitch_fb_ad_creatives.sql index 38e6a7c..f868af3 100755 --- a/macros/stitch/base/stitch_fb_ad_creatives.sql +++ b/macros/stitch/base/stitch_fb_ad_creatives.sql @@ -1,6 +1,6 @@ {% macro stitch_fb_ad_creatives() %} - {{ adapter.dispatch('stitch_fb_ad_creatives', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ad_creatives', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/stitch/base/stitch_fb_ad_creatives__child_links.sql b/macros/stitch/base/stitch_fb_ad_creatives__child_links.sql index df31041..4c341a5 100644 --- a/macros/stitch/base/stitch_fb_ad_creatives__child_links.sql +++ b/macros/stitch/base/stitch_fb_ad_creatives__child_links.sql @@ -5,7 +5,7 @@ {% macro stitch_fb_ad_creatives__child_links() %} - {{ adapter.dispatch('stitch_fb_ad_creatives__child_links', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ad_creatives__child_links', 'facebook_ads')() }} {% endmacro %} @@ -14,7 +14,7 @@ with base as ( - select * from {{ var('ad_creatives__child_links_table', packages=facebook_ads._get_facebook_ads_namespaces())() }} + select * from {{ var('ad_creatives__child_links_table') }} ), diff --git a/macros/stitch/base/stitch_fb_ad_insights.sql b/macros/stitch/base/stitch_fb_ad_insights.sql index a5b68d8..1bd2c7a 100755 --- a/macros/stitch/base/stitch_fb_ad_insights.sql +++ b/macros/stitch/base/stitch_fb_ad_insights.sql @@ -1,6 +1,6 @@ {% macro stitch_fb_ad_insights() %} - {{ adapter.dispatch('stitch_fb_ad_insights', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ad_insights', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/stitch/base/stitch_fb_ads.sql b/macros/stitch/base/stitch_fb_ads.sql index fab157f..1c16aa0 100755 --- a/macros/stitch/base/stitch_fb_ads.sql +++ b/macros/stitch/base/stitch_fb_ads.sql @@ -1,6 +1,6 @@ {% macro stitch_fb_ads() %} - {{ adapter.dispatch('stitch_fb_ads', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ads', 'facebook_ads')() }} {% endmacro %} diff --git a/macros/stitch/base/stitch_fb_ads_adsets.sql b/macros/stitch/base/stitch_fb_ads_adsets.sql index ef00a0e..b6a7f93 100755 --- a/macros/stitch/base/stitch_fb_ads_adsets.sql +++ b/macros/stitch/base/stitch_fb_ads_adsets.sql @@ -1,6 +1,6 @@ {% macro stitch_fb_ads_adsets() %} - {{ adapter.dispatch('stitch_fb_ads_adsets',packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ads_adsets','facebook_ads')() }} {% endmacro %} diff --git a/macros/stitch/base/stitch_fb_campaigns.sql b/macros/stitch/base/stitch_fb_campaigns.sql index 78a990e..77542bb 100755 --- a/macros/stitch/base/stitch_fb_campaigns.sql +++ b/macros/stitch/base/stitch_fb_campaigns.sql @@ -1,6 +1,6 @@ {% macro stitch_fb_ads_campaigns() %} - {{ adapter.dispatch('stitch_fb_ads_campaigns', packages=facebook_ads._get_facebook_ads_namespaces())() }} + {{ adapter.dispatch('stitch_fb_ads_campaigns', 'facebook_ads')() }} {% endmacro %} diff --git a/packages.yml b/packages.yml index 2246ac8..5302a1f 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - - package: fishtown-analytics/dbt_utils - version: [">=0.6.0", "<0.7.0"] + - package: dbt-labs/dbt_utils + version: [">=0.7.0", "<0.8.0"]