Skip to content

Commit 6121003

Browse files
fivetran-joemarkiewiczfivetran-joemarkiewicz
authored
Merge pull request #41 from fivetran/MagicBot_02eb08cdca
Magic bot 02eb08cdca
2 parents 15e391d + 324324f commit 6121003

File tree

50 files changed

+40
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+40
-27
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
target/
33
dbt_modules/
44
logs/
5+
6+
dbt_packages/

‎CHANGELOG.md

+9

‎README.md

+2-2

‎dbt_project.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: 'ad_reporting'
2-
version: '0.5.1'
2+
version: '0.6.0'
33
config-version: 2
44

5-
require-dbt-version: [">=0.20.0"]
5+
require-dbt-version: [">=1.0.0", "<2.0.0"]
66

77
vars:
88
ad_reporting__pinterest_enabled: true

‎integration_tests/ci/sample.profiles.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ integration_tests:
3838
spark:
3939
type: spark
4040
method: http
41-
schema: ad_reporting_integration_tests
41+
schema: ad_reporting_integrations_tests
4242
host: "{{ env_var('CI_SPARK_DBT_HOST') }}"
4343
organization: "{{ env_var('CI_SPARK_DBT_ORGANIZATION') }}"
4444
token: "{{ env_var('CI_SPARK_DBT_TOKEN') }}"
@@ -57,4 +57,4 @@ integration_tests:
5757
schema: ad_reporting_integration_tests
5858
threads: 8
5959
keepalives_idle: 0
60-
sslmode: prefer
60+
sslmode: prefer

‎integration_tests/dbt_project.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'ad_reporting_integration_tests'
2-
version: '0.5.1'
2+
version: '0.6.0'
33
profile: 'integration_tests'
44
config-version: 2
55

‎integration_tests/requirements.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
dbt==0.20.1rc1
2-
dbt-spark==0.20.1rc1
3-
dbt-spark[PyHive]==0.20.1rc1
1+
dbt-snowflake==1.0.0
2+
dbt-bigquery==1.0.0
3+
dbt-redshift==1.0.0
4+
dbt-postgres==1.0.0
5+
dbt-spark==1.0.0
6+
dbt-spark[PyHive]==1.0.0

‎integration_tests/data/ad_group_history_data.csv renamed to ‎integration_tests/seeds/ad_group_history_data.csv

File renamed without changes.

‎integration_tests/data/campaign_history_data.csv renamed to ‎integration_tests/seeds/campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_account_history_data.csv renamed to ‎integration_tests/seeds/facebook_ads_account_history_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_ad_history_data.csv renamed to ‎integration_tests/seeds/facebook_ads_ad_history_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_ad_set_history_data.csv renamed to ‎integration_tests/seeds/facebook_ads_ad_set_history_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_basic_ad_data.csv renamed to ‎integration_tests/seeds/facebook_ads_basic_ad_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_campaign_history_data.csv renamed to ‎integration_tests/seeds/facebook_ads_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/facebook_ads_creative_history_data.csv renamed to ‎integration_tests/seeds/facebook_ads_creative_history_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_account_data.csv renamed to ‎integration_tests/seeds/google_ads_account_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_ad_final_url_history_data.csv renamed to ‎integration_tests/seeds/google_ads_ad_final_url_history_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_ad_group_history_data.csv renamed to ‎integration_tests/seeds/google_ads_ad_group_history_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_ad_history_data.csv renamed to ‎integration_tests/seeds/google_ads_ad_history_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_ad_stats_data.csv renamed to ‎integration_tests/seeds/google_ads_ad_stats_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_campaign_history_data.csv renamed to ‎integration_tests/seeds/google_ads_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_click_performance_data.csv renamed to ‎integration_tests/seeds/google_ads_click_performance_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_criteria_performance_data.csv renamed to ‎integration_tests/seeds/google_ads_criteria_performance_data.csv

File renamed without changes.

‎integration_tests/data/google_ads_final_url_performance_data.csv renamed to ‎integration_tests/seeds/google_ads_final_url_performance_data.csv

File renamed without changes.

‎integration_tests/data/linkedin_account_history_data.csv renamed to ‎integration_tests/seeds/linkedin_account_history_data.csv

File renamed without changes.

‎integration_tests/data/linkedin_ad_analytics_by_creative_data.csv renamed to ‎integration_tests/seeds/linkedin_ad_analytics_by_creative_data.csv

File renamed without changes.

‎integration_tests/data/linkedin_campaign_group_history_data.csv renamed to ‎integration_tests/seeds/linkedin_campaign_group_history_data.csv

File renamed without changes.

‎integration_tests/data/linkedin_campaign_history_data.csv renamed to ‎integration_tests/seeds/linkedin_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/linkedin_creative_history_data.csv renamed to ‎integration_tests/seeds/linkedin_creative_history_data.csv

File renamed without changes.

‎integration_tests/data/microsoft_ads_account_history_data.csv renamed to ‎integration_tests/seeds/microsoft_ads_account_history_data.csv

File renamed without changes.

‎integration_tests/data/microsoft_ads_ad_group_history_data.csv renamed to ‎integration_tests/seeds/microsoft_ads_ad_group_history_data.csv

File renamed without changes.

‎integration_tests/data/microsoft_ads_ad_history_data.csv renamed to ‎integration_tests/seeds/microsoft_ads_ad_history_data.csv

File renamed without changes.

‎integration_tests/data/microsoft_ads_ad_performance_daily_report_data.csv renamed to ‎integration_tests/seeds/microsoft_ads_ad_performance_daily_report_data.csv

File renamed without changes.

‎integration_tests/data/microsoft_ads_campaign_history_data.csv renamed to ‎integration_tests/seeds/microsoft_ads_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/pin_promotion_history_data.csv renamed to ‎integration_tests/seeds/pin_promotion_history_data.csv

File renamed without changes.

‎integration_tests/data/pin_promotion_report_data.csv renamed to ‎integration_tests/seeds/pin_promotion_report_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_ad_account_history_data.csv renamed to ‎integration_tests/seeds/snapchat_ad_account_history_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_ad_history_data.csv renamed to ‎integration_tests/seeds/snapchat_ad_history_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_ad_hourly_report_data.csv renamed to ‎integration_tests/seeds/snapchat_ad_hourly_report_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_ad_squad_history_data.csv renamed to ‎integration_tests/seeds/snapchat_ad_squad_history_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_campaign_history_data.csv renamed to ‎integration_tests/seeds/snapchat_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_creative_history_data.csv renamed to ‎integration_tests/seeds/snapchat_creative_history_data.csv

File renamed without changes.

‎integration_tests/data/snapchat_creative_url_tag_history_data.csv renamed to ‎integration_tests/seeds/snapchat_creative_url_tag_history_data.csv

File renamed without changes.

‎integration_tests/data/twitter_account_history_data.csv renamed to ‎integration_tests/seeds/twitter_account_history_data.csv

File renamed without changes.

‎integration_tests/data/twitter_campaign_history_data.csv renamed to ‎integration_tests/seeds/twitter_campaign_history_data.csv

File renamed without changes.

‎integration_tests/data/twitter_line_item_history_data.csv renamed to ‎integration_tests/seeds/twitter_line_item_history_data.csv

File renamed without changes.

‎integration_tests/data/twitter_promoted_tweet_history_data.csv renamed to ‎integration_tests/seeds/twitter_promoted_tweet_history_data.csv

File renamed without changes.

‎integration_tests/data/twitter_promoted_tweet_report_data.csv renamed to ‎integration_tests/seeds/twitter_promoted_tweet_report_data.csv

File renamed without changes.

‎integration_tests/data/twitter_tweet_url_data.csv renamed to ‎integration_tests/seeds/twitter_tweet_url_data.csv

File renamed without changes.

‎packages.yml

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
packages:
2+
- package: fivetran/pinterest
3+
version: [">=0.5.0", "<0.6.0"]
24

3-
- package: fivetran/pinterest
4-
version: [">=0.4.0", "<0.5.0"]
5+
- package: fivetran/microsoft_ads
6+
version: [">=0.4.0", "<0.5.0"]
57

6-
- package: fivetran/microsoft_ads
7-
version: [">=0.3.0", "<0.4.0"]
8-
9-
- package: fivetran/linkedin
10-
version: [">=0.3.0", "<0.4.0"]
8+
- package: fivetran/linkedin
9+
version: [">=0.4.0", "<0.5.0"]
1110

12-
- package: fivetran/google_ads
13-
version: [">=0.4.0", "<0.5.0"]
14-
15-
- package: fivetran/twitter_ads
16-
version: [">=0.3.0", "<0.4.0"]
17-
18-
- package: fivetran/facebook_ads
19-
version: [">=0.3.0", "<0.4.0"]
11+
- package: fivetran/google_ads
12+
version: [">=0.5.0", "<0.6.0"]
2013

21-
- package: fivetran/snapchat_ads
22-
version: [">=0.2.0", "<0.3.0"]
14+
- package: fivetran/twitter_ads
15+
version: [">=0.4.0", "<0.5.0"]
16+
17+
- package: fivetran/facebook_ads
18+
version: [">=0.4.0", "<0.5.0"]
19+
20+
- package: fivetran/snapchat_ads
21+
version: [">=0.3.0", "<0.4.0"]

0 commit comments

Comments
 (0)