From ca0944d9d074b3742de216048d38f3370152f5ab Mon Sep 17 00:00:00 2001 From: Morgan Gellert Date: Mon, 15 Jun 2026 11:12:16 -0700 Subject: [PATCH 1/3] fix macro argument types --- dbt_project.yml | 9 ++++++--- macros/macros_docs.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index 8778148f..63c7c237 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -17,8 +17,11 @@ vars: models: ad_reporting: - +materialized: table - +schema: ad_reporting + +materialized: table + +schema: ad_reporting intermediate: +materialized: ephemeral - +schema: int_ad_reporting \ No newline at end of file + +schema: int_ad_reporting + +flags: + validate_macro_args: true diff --git a/macros/macros_docs.yml b/macros/macros_docs.yml index c490b997..f8eb87f8 100644 --- a/macros/macros_docs.yml +++ b/macros/macros_docs.yml @@ -3,7 +3,7 @@ version: 2 macros: - name: get_date_from_timestamp description: This macro takes a column of type timestamp or forces the column into a timestamp (depending on the data warehouse) and extracts the date in the format of e.g. 2022-01-01. - arguments: + arguments: - name: column type: string description: Specifies the column of type timestamp to extract the date from. @@ -12,12 +12,12 @@ macros: description: This macro evaluates all `ad_reporting___enabled` variables in the user's `dbt_project.yml` and returns a list of packages that are enabled. arguments: - name: exclude - type: list + type: optional[list[string]] description: This argument is optional and is the list of platforms to exclude in the enabled package evaluation. - name: include - type: list + type: optional[list[string]] description: This argument is optional and is the list of platforms to include in the enabled package evaluation. - + - name: get_query description: This macro compiles the final query with all aliasing and casting incorporated. arguments: @@ -33,20 +33,20 @@ macros: description: > A dictionary that specifies any column name overriding as necessary since standard names in Ad Reporting may map to a different name as it appears natively within each platform. Each key will have exactly one corresponding string value; if a value is NULL then it will map to the string 'null'. - name: relation - description: > + description: > This is a reference to the upstream model that the query will be selecting from; an example argument would look like this: relation=ref('tiktok_ads__advertiser_report'). - + - name: is_enabled description: This macro takes in a list of packages and determines if there is at least one package, if there is, it returns True, else false. arguments: - name: enabled_packages - type: list + type: list[string] description: List of packages enabled where each package name is a string. - + - name: union_ctes description: This macro allows for the unioning (union all) of specified CTEs. arguments: - name: ctes - type: list + type: optional[list[string]] description: List of strings for CTE names From cca60554b1cd64812ff283c3775398b9082b8a32 Mon Sep 17 00:00:00 2001 From: Morgan Gellert Date: Wed, 17 Jun 2026 14:38:08 -0700 Subject: [PATCH 2/3] Update CHANGELOG and semantic version --- CHANGELOG.md | 7 +++++++ dbt_project.yml | 2 +- integration_tests/dbt_project.yml | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 280779ec..458adb0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# dbt_ad_reporting v2.6.1 + +[PR #NNN](https://github.com/fivetran/dbt_ad_reporting/pull/NNN) includes the following updates: + +## Bug Fixes +- Fixes macro argument types + # dbt_ad_reporting v2.6.0 [PR #176](https://github.com/fivetran/dbt_ad_reporting/pull/176) includes the following updates: diff --git a/dbt_project.yml b/dbt_project.yml index 63c7c237..076a719a 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'ad_reporting' -version: '2.6.0' +version: '2.6.1' config-version: 2 diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 6d4d3c12..c84f86fb 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'ad_reporting_integration_tests' -version: '2.6.0' +version: '2.6.1' profile: 'integration_tests' config-version: 2 @@ -984,3 +984,4 @@ seeds: flags: send_anonymous_usage_stats: False use_colors: True + validate_macro_args: True From 717d563ab926e8c5d78593a2241c27a472c06e97 Mon Sep 17 00:00:00 2001 From: Morgan Gellert Date: Wed, 17 Jun 2026 14:45:03 -0700 Subject: [PATCH 3/3] add pr reference to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 458adb0a..8dcb5263 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # dbt_ad_reporting v2.6.1 -[PR #NNN](https://github.com/fivetran/dbt_ad_reporting/pull/NNN) includes the following updates: +[PR #180](https://github.com/fivetran/dbt_ad_reporting/pull/180) includes the following updates: ## Bug Fixes - Fixes macro argument types