Merge pull request dbt-labs#34 from fishtown-analytics/fix/adapter-ma…

…cro-091 prefix adapter macro with package name (for 091)
jocelynstinson · Jan 6, 2018 · c5a9089 · c5a9089
2 parents af8102f + 1e85599
commit c5a9089
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -22,7 +22,7 @@ all_periods as (
 
     select (
         {{
-            dateadd(
+            dbt_utils.dateadd(
                 datepart,
                 "row_number() over () - 1",
                 start_date