From 1e85599d4ee72625ebe955492f6f1f755a3db40f Mon Sep 17 00:00:00 2001 From: Drew Banin Date: Tue, 19 Dec 2017 14:51:16 -0500 Subject: [PATCH] prefix adapter macro with package name (For 091) --- macros/cross_db_utils/current_timestamp.sql | 6 +++++- macros/cross_db_utils/dateadd.sql | 2 +- macros/cross_db_utils/split_part.sql | 2 +- macros/datetime/date_spine.sql | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/macros/cross_db_utils/current_timestamp.sql b/macros/cross_db_utils/current_timestamp.sql index 38f3766d..50e68816 100644 --- a/macros/cross_db_utils/current_timestamp.sql +++ b/macros/cross_db_utils/current_timestamp.sql @@ -1,5 +1,5 @@ {% macro current_timestamp() %} - {{ adapter_macro('current_timestamp') }} + {{ adapter_macro('dbt_utils.current_timestamp') }} {% endmacro %} {% macro default__current_timestamp() %} @@ -9,3 +9,7 @@ {% macro redshift__current_timestamp() %} current_timestamp::timestamp {% endmacro %} + +{% macro postgres__current_timestamp() %} + current_timestamp::timestamp +{% endmacro %} diff --git a/macros/cross_db_utils/dateadd.sql b/macros/cross_db_utils/dateadd.sql index 189051d0..3969fe9c 100644 --- a/macros/cross_db_utils/dateadd.sql +++ b/macros/cross_db_utils/dateadd.sql @@ -1,5 +1,5 @@ {% macro dateadd(datepart, interval, from_date_or_timestamp) %} - {{ adapter_macro('dateadd', datepart, interval, from_date_or_timestamp) }} + {{ adapter_macro('dbt_utils.dateadd', datepart, interval, from_date_or_timestamp) }} {% endmacro %} diff --git a/macros/cross_db_utils/split_part.sql b/macros/cross_db_utils/split_part.sql index 8b60a666..c2599486 100644 --- a/macros/cross_db_utils/split_part.sql +++ b/macros/cross_db_utils/split_part.sql @@ -1,5 +1,5 @@ {% macro split_part(string_text, delimiter_text, part_number) %} - {{ adapter_macro('split_part', string_text, delimiter_text, part_number) }} + {{ adapter_macro('dbt_utils.split_part', string_text, delimiter_text, part_number) }} {% endmacro %} diff --git a/macros/datetime/date_spine.sql b/macros/datetime/date_spine.sql index 0afc0e8a..8bb090a3 100644 --- a/macros/datetime/date_spine.sql +++ b/macros/datetime/date_spine.sql @@ -22,7 +22,7 @@ all_periods as ( select ( {{ - dateadd( + dbt_utils.dateadd( datepart, "row_number() over () - 1", start_date