Skip to content

Commit

Permalink
Fold in major releases from Google Ads and Linkedin Ads (#115)
Browse files Browse the repository at this point in the history
* Stage

* polish PR

* update schema var

* update package refs

* Updated REAME.md (#116)

* Update README.md

Added a new blank line between lines 44 and 45 of the README.md

* Update CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com>

---------

Co-authored-by: Fivetran-milanjovic <141134515+Fivetran-milanjovic@users.noreply.github.com>
Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 30, 2024
1 parent f6cf84c commit 8a6da2f
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 52 deletions.
4 changes: 2 additions & 2 deletions .buildkite/scripts/run_models.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ echo `pwd`
cd integration_tests
dbt deps
dbt seed --target "$db" --full-refresh
dbt run --target "$db" --full-refresh --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: false, ad_reporting__microsoft_ads_enabled: true, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'
dbt test --target "$db" --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: false, ad_reporting__microsoft_ads_enabled: true, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'
dbt run --target "$db" --full-refresh --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'
dbt test --target "$db" --vars '{ad_reporting__facebook_ads_enabled: true, ad_reporting__google_ads_enabled: true, ad_reporting__amazon_ads_enabled: false, ad_reporting__apple_search_ads_enabled: false, ad_reporting__linkedin_ads_enabled: true, ad_reporting__microsoft_ads_enabled: false, ad_reporting__pinterest_ads_enabled: false, ad_reporting__reddit_ads_enabled: false, ad_reporting__snapchat_ads_enabled: false, ad_reporting__tiktok_ads_enabled: false, ad_reporting__twitter_ads_enabled: false}'

dbt run-operation fivetran_utils.drop_schemas_automation --target "$db"
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# dbt_ad_reporting vNEXTRELEASE
# dbt_ad_reporting v1.9.0

## Under the Hood
- Addition of an blank line between the quoted line and the comment.

## Under the Hood
- Addition of a section tag within the README so the model descriptions may be accessible within the Fivetran UI for Quickstart. ([PR #113](https://github.com/fivetran/dbt_ad_reporting/pull/113))
- Upticked the `google_ads` and `linkedin_ads` dependencies following major releases in both packages in which conversion metrics have been added. Refer to the individual package release notes for more details ([Google Ads](https://github.com/fivetran/dbt_google_ads/releases/tag/v0.11.0), [Linkedin Ads](https://github.com/fivetran/dbt_linkedin/releases/tag/v0.9.0)). ([PR #115](https://github.com/fivetran/dbt_ad_reporting/pull/115))
- Note: Default conversions have not been added to `ad_reporting` models _yet_, as we are rolling out conversion support to all upstream Ad packages first.

## Contributors
- [Seer Interactive](https://www.seerinteractive.com/?utm_campaign=Fivetran%20%7C%20Models&utm_source=Fivetran&utm_medium=Fivetran%20Documentation)
- [@fivetran-poonamagate](https://github.com/fivetran-poonamagate) ([PR #59](https://github.com/fivetran/dbt_google_ads_source/pull/59))

# dbt_ad_reporting v1.8.0

Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Refer to the table below for a detailed view of final models materialized by def
| [ad_reporting__url_report](https://fivetran.github.io/dbt_ad_reporting/#!/model/model.ad_reporting.ad_reporting__url_report) | Each record represents daily metrics by URL (and if applicable, URL UTM parameters), ad group, campaign and account. |

> The individual platform models may have additional platform-specific metrics and fields better suited for deep-dive analyses at the platform level.
<!--section-end-->

# 🎯 How do I use the dbt package?
Expand Down Expand Up @@ -79,7 +80,7 @@ Include the following github package version in your `packages.yml`
```yaml
packages:
- package: fivetran/ad_reporting
version: [">=1.7.0", "<1.8.0"] # we recommend using ranges to capture non-breaking changes automatically
version: [">=1.9.0", "<1.10.0"] # we recommend using ranges to capture non-breaking changes automatically
```

Do NOT include the individual ad platform packages in this file. The ad reporting package itself has dependencies on these packages and will install them as well.
Expand Down Expand Up @@ -579,10 +580,10 @@ packages:
version: [">=0.7.0", "<0.8.0"]
- package: fivetran/google_ads
version: [">=0.10.0", "<0.11.0"]
version: [">=0.11.0", "<0.12.0"]
- package: fivetran/google_ads_source
version: [">=0.10.0", "<0.11.0"]
version: [">=0.11.0", "<0.12.0"]
- package: fivetran/pinterest
version: [">=0.10.0", "<0.11.0"]
Expand All @@ -597,10 +598,10 @@ packages:
version: [">=0.9.0", "<0.10.0"]
- package: fivetran/linkedin
version: [">=0.8.0", "<0.9.0"]
version: [">=0.9.0", "<0.10.0"]
- package: fivetran/linkedin_source
version: [">=0.8.0", "<0.9.0"]
version: [">=0.9.0", "<0.10.0"]
- package: fivetran/reddit_ads
version: [">=0.2.0", "<0.3.0"]
Expand Down
2 changes: 1 addition & 1 deletion dbt_project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'ad_reporting'
version: '1.8.0'
version: '1.9.0'

config-version: 2

Expand Down
2 changes: 1 addition & 1 deletion docs/catalog.json

Large diffs are not rendered by default.

47 changes: 10 additions & 37 deletions docs/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/run_results.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion integration_tests/dbt_project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'ad_reporting_integration_tests'
version: '1.8.0'
version: '1.9.0'
profile: 'integration_tests'
config-version: 2

Expand Down Expand Up @@ -251,9 +251,14 @@ seeds:
+column_types:
created_time: timestamp
last_modified_time: timestamp
linkedin_ad_analytics_by_campaign_data:
+column_types:
day: timestamp
external_website_conversions: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
linkedin_ad_analytics_by_creative_data:
+column_types:
day: timestamp
external_website_conversions: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}"
linkedin_ad_account_history_data:
+column_types:
created_time: timestamp
Expand Down
4 changes: 2 additions & 2 deletions packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ packages:
version: [">=0.7.0", "<0.8.0"]

- package: fivetran/google_ads
version: [">=0.10.0", "<0.11.0"]
version: [">=0.11.0", "<0.12.0"]

- package: fivetran/linkedin
version: [">=0.8.0", "<0.9.0"]
version: [">=0.9.0", "<0.10.0"]

- package: fivetran/microsoft_ads
version: [">=0.8.0", "<0.9.0"]
Expand Down

0 comments on commit 8a6da2f

Please sign in to comment.