Merge branch 'main' into MagicBot/dbt-utils-cross-db-migration

.buildkite/pipeline.yml

@@ -58,7 +58,7 @@ steps:
     commands: |
       bash .buildkite/scripts/run_models.sh redshift
 
-  - label: ":databricks: Run Tests - Databricks"
+  - label: ":bricks: Run Tests - Databricks"
     key: "run_dbt_databricks"
     plugins:
       - docker#v3.13.0:

CHANGELOG.md

@@ -42,6 +42,11 @@
 ## 🚘 Under the Hood 🚘
 - Disabled the `not_null` test for `google_ads__url_report` when null urls are allowed ([#39](https://github.com/fivetran/dbt_google_ads/pull/39)).
 
+# dbt_google_ads v0.8.1
+
+## Updates:
+- Updates `google_ads__ad_report` model to get `ad_id` from `ad_stats` table rather than from `ads_history`. ([#37](https://github.com/fivetran/dbt_google_ads/pull/37))
+
 # dbt_google_ads v0.8.0
 ## 🚨 Breaking Changes 🚨
 - The `adwords` api version of the package has been fully removed. As the Fivetran Google Ads connector now requires the Google Ads API, this functionality is no longer used. ([#34](https://github.com/fivetran/dbt_google_ads/pull/34))

dbt_project.yml

@@ -1,5 +1,6 @@
 name: 'google_ads'
 version: '0.9.0'
+
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 models:

integration_tests/ci/sample.profiles.yml

@@ -1,4 +1,3 @@
-
 # HEY! This file is used in the dbt package integrations tests with Buildkite.
 # You should __NEVER__ check credentials into version control. Thanks for reading :)
 
@@ -16,13 +15,13 @@ integration_tests:
       pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}"
       dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}"
       port: 5439
-      schema: google_ads_integration_tests_3
+      schema: google_ads_integration_tests_30
       threads: 8
     bigquery:
       type: bigquery
       method: service-account-json
       project: 'dbt-package-testing'
-      schema: google_ads_integration_tests_3
+      schema: google_ads_integration_tests_30
       threads: 8
       keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}"
     snowflake:
@@ -33,7 +32,7 @@ integration_tests:
       role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}"
       database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}"
       warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}"
-      schema: google_ads_integration_tests_3
+      schema: google_ads_integration_tests_30
       threads: 8
     postgres:
       type: postgres
@@ -42,13 +41,13 @@ integration_tests:
       pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}"
       dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}"
       port: 5432
-      schema: google_ads_integration_tests_3
+      schema: google_ads_integration_tests_30
       threads: 8
     databricks:
       catalog: null
       host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}"
       http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}"
-      schema: google_ads_integration_tests_3
+      schema: google_ads_integration_tests_30
       threads: 2
       token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}"
       type: databricks

integration_tests/dbt_project.yml

@@ -1,10 +1,11 @@
 name: 'google_ads_integration_tests'
 version: '0.9.0'
+
 profile: 'integration_tests'
 config-version: 2
 
 vars:
-  google_ads_schema: google_ads_integration_tests_3
+  google_ads_schema: google_ads_integration_tests_30
   google_ads_ad_stats_identifier: "ad_stats_data"
   google_ads_ad_history_identifier: "ad_history_data"
   google_ads_ad_group_history_identifier: "ad_group_history_data"

models/google_ads__ad_report.sql

@@ -44,7 +44,7 @@ fields as (
         campaigns.campaign_id,
         ad_groups.ad_group_name,
         ad_groups.ad_group_id,
-        ads.ad_id,
+        stats.ad_id,
         ads.ad_name,
         ads.ad_status,
         ads.ad_type,