revise magicbot

models/amazon_ads.yml

@@ -1,4 +1,3 @@
-UPDATE TESTS AND CHECK SOURCE_RELATION ADDED PROPERLY!!! (delete line when done.)
 version: 2
 
 models:

models/amazon_ads__account_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/amazon_ads__ad_group_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/amazon_ads__ad_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/amazon_ads__campaign_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/amazon_ads__keyword_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/amazon_ads__portfolio_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=fivetran_utils.enabled_vars(['ad_reporting__amazon_ads_enabled','amazon_ads__portfolio_history_enabled'])) }}
 
 with report as (

models/amazon_ads__search_report.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 with report as (

models/docs.md

@@ -177,6 +177,7 @@ The state of the record (enabled, paused, or archived).
 {% docs targeting %}
 A string representation of the expression object used in the targeting clause.
 {% enddocs %}
+
 {% docs source_relation %}
 The source of the record if the unioning functionality is being used. If not this field will be empty.
 {% enddocs %}

models/intermediate/int_amazon_ads__portfolio_history.sql

@@ -1,5 +1,3 @@
-ADD source_relation WHERE NEEDED + CHECK JOINS AND WINDOW FUNCTIONS! (Delete this line when done.)
-
 {{ config(enabled=var('ad_reporting__amazon_ads_enabled', True)) }}
 
 {# This intermediate model creates a dummy portfolio table if the user does not use portfolios. 
@@ -12,6 +10,7 @@ with portfolios as (
         from {{ var('portfolio_history') }}
         where is_most_recent_record = True
     {% else %}
+        cast(null as {{ dbt.type_string() }}) as source_relation,
         {# uses the columns macro from the source package to populate column names #}
         {%- set columns = amazon_ads_source.get_portfolio_history_columns() -%}
         {% for column in columns %}

packages.yml

@@ -1,7 +1,7 @@
 packages:
-  - package: fivetran/amazon_ads_source
-    version: [">=0.2.0", "<0.3.0"]
+  # - package: fivetran/amazon_ads_source
+  #   version: [">=0.2.0", "<0.3.0"]
 
-- git: https://github.com/fivetran/amazon_ads_source.git
+- git: https://github.com/fivetran/dbt_amazon_ads_source.git
   revision: MagicBot/add-union-schema
   warn-unpinned: false