generalize rest of macros

rfeith2 · Jan 5, 2021 · ae8d040 · ae8d040
1 parent 61d0dd1
commit ae8d040
Show file tree

Hide file tree

Showing 21 changed files with 102 additions and 1 deletion.
diff --git a/macros/datetime/date_spine.sql b/macros/datetime/date_spine.sql
@@ -1,5 +1,8 @@
 {% macro get_intervals_between(start_date, end_date, datepart) -%}
+    {{ adapter.dispatch('get_intervals_between', packages = dbt_utils._get_utils_namespaces())(start_date, end_date, datepart) }}
+{%- endmacro %}
 
+{% macro default__get_intervals_between(start_date, end_date, datepart) -%}
     {%- call statement('get_intervals_between', fetch_result=True) %}
 
         select {{dbt_utils.datediff(start_date, end_date, datepart)}}
@@ -21,6 +24,10 @@
 
 
 {% macro date_spine(datepart, start_date, end_date) %}
+    {{ adapter.dispatch('date_spine', packages = dbt_utils._get_utils_namespaces())(datepart, start_date, end_date) }}
+{%- endmacro %}
+
+{% macro default__date_spine(datepart, start_date, end_date) %}
 
 /*
 call as follows:

diff --git a/macros/geo/haversine_distance.sql b/macros/geo/haversine_distance.sql
@@ -7,6 +7,10 @@ The arguments should be float type.
 #}
 
 {% macro haversine_distance(lat1,lon1,lat2,lon2) -%}
+    {{ adapter.dispatch('haversine_distance', packages = dbt_utils._get_utils_namespaces())(lat1,lon1,lat2,lon2) }}
+{% endmacro %}
+
+{% macro default__haversine_distance(lat1,lon1,lat2,lon2) -%}
 
     2 * 3961 * asin(sqrt((sin(radians(({{lat2}} - {{lat1}}) / 2))) ^ 2 +
     cos(radians({{lat1}})) * cos(radians({{lat2}})) *

diff --git a/macros/materializations/insert_by_period_materialization.sql b/macros/materializations/insert_by_period_materialization.sql
@@ -1,4 +1,8 @@
 {% macro get_period_boundaries(target_schema, target_table, timestamp_field, start_date, stop_date, period) -%}
+    {{ adapter.dispatch('get_period_boundaries', packages = dbt_utils._get_utils_namespaces())(target_schema, target_table, timestamp_field, start_date, stop_date, period) }}
+{% endmacro %}
+
+{% macro default__get_period_boundaries(target_schema, target_table, timestamp_field, start_date, stop_date, period) -%}
 
   {% call statement('period_boundaries', fetch_result=True) -%}
     with data as (

diff --git a/macros/sql/generate_series.sql b/macros/sql/generate_series.sql
@@ -1,4 +1,8 @@
 {% macro get_powers_of_two(upper_bound) %}
+    {{ adapter.dispatch('get_powers_of_two', packages = dbt_utils._get_utils_namespaces())(upper_bound) }}
+{% endmacro %}
+
+{% macro default__get_powers_of_two(upper_bound) %}
 
     {% if upper_bound <= 0 %}
     {{ exceptions.raise_compiler_error("upper bound must be positive") }}
@@ -12,6 +16,10 @@
 
 
 {% macro generate_series(upper_bound) %}
+    {{ adapter.dispatch('generate_series', packages = dbt_utils._get_utils_namespaces())(upper_bound) }}
+{% endmacro %}
+
+{% macro default__generate_series(upper_bound) %}
 
     {% set n = dbt_utils.get_powers_of_two(upper_bound) %}
 

diff --git a/macros/sql/get_column_values.sql b/macros/sql/get_column_values.sql
@@ -11,6 +11,10 @@ Returns:
 #}
 
 {% macro get_column_values(table, column, max_records=none, default=none) -%}
+    {{ adapter.dispatch('get_column_values', packages = dbt_utils._get_utils_namespaces())(table, column, max_records=none, default=none) }}
+{% endmacro %}
+
+{% macro default__get_column_values(table, column, max_records=none, default=none) -%}
 
 {#-- Prevent querying of db in parsing mode. This works because this macro does not create any new refs. #}
     {%- if not execute -%}

diff --git a/macros/sql/get_query_results_as_dict.sql b/macros/sql/get_query_results_as_dict.sql
@@ -1,4 +1,9 @@
 {% macro get_query_results_as_dict(query) %}
+    {{ adapter.dispatch('get_query_results_as_dict', packages = dbt_utils._get_utils_namespaces())(query) }}
+{% endmacro %}
+
+{% macro default__get_query_results_as_dict(query) %}
+
 {# This macro returns a dictionary of the form {column_name: (tuple_of_results)} #}
 
     {%- call statement('get_query_results', fetch_result=True,auto_begin=false) -%}

diff --git a/macros/sql/get_relations_by_pattern.sql b/macros/sql/get_relations_by_pattern.sql
@@ -1,4 +1,8 @@
 {% macro get_relations_by_pattern(schema_pattern, table_pattern, exclude='', database=target.database) %}
+    {{ adapter.dispatch('get_relations_by_pattern', packages = dbt_utils._get_utils_namespaces())(schema_pattern, table_pattern, exclude='', database=target.database) }}
+{% endmacro %}
+
+{% macro default__get_relations_by_pattern(schema_pattern, table_pattern, exclude='', database=target.database) %}
 
     {%- call statement('get_tables', fetch_result=True) %}
 

diff --git a/macros/sql/get_relations_by_prefix.sql b/macros/sql/get_relations_by_prefix.sql
@@ -1,4 +1,8 @@
 {% macro get_relations_by_prefix(schema, prefix, exclude='', database=target.database) %}
+    {{ adapter.dispatch('get_relations_by_prefix', packages = dbt_utils._get_utils_namespaces())(schema, prefix, exclude='', database=target.database) }}
+{% endmacro %}
+
+{% macro default__get_relations_by_prefix(schema, prefix, exclude='', database=target.database) %}
 
     {%- call statement('get_tables', fetch_result=True) %}
 

diff --git a/macros/sql/get_tables_by_prefix_sql.sql b/macros/sql/get_tables_by_prefix_sql.sql
@@ -1,5 +1,9 @@
 {% macro get_tables_by_prefix_sql(schema, prefix, exclude='', database=target.database) %}
-
+    {{ adapter.dispatch('get_tables_by_prefix_sql', packages = dbt_utils._get_utils_namespaces())(schema, prefix, exclude='', database=target.database) }}
+{% endmacro %}
+
+{% macro default__get_tables_by_prefix_sql(schema, prefix, exclude='', database=target.database) %}
+
     {{ dbt_utils.get_tables_by_pattern_sql(
         schema_pattern = schema,
         table_pattern = prefix ~ '%',

diff --git a/macros/sql/groupby.sql b/macros/sql/groupby.sql
@@ -1,4 +1,8 @@
 {%- macro group_by(n) -%}
+    {{ adapter.dispatch('group_by', packages = dbt_utils._get_utils_namespaces())(n) }}
+{% endmacro %}
+
+{%- macro default__group_by(n) -%}
 
   group by {% for i in range(1, n + 1) -%}
       {{ i }}{{ ',' if not loop.last }}   

diff --git a/macros/sql/nullcheck.sql b/macros/sql/nullcheck.sql
@@ -1,4 +1,8 @@
 {% macro nullcheck(cols) %}
+    {{ adapter.dispatch('nullcheck', packages = dbt_utils._get_utils_namespaces())(cols) }}
+{% endmacro %}
+
+{% macro default__nullcheck(cols) %}
 {%- for col in cols %}
 
     {% if col.is_string() -%}

diff --git a/macros/sql/nullcheck_table.sql b/macros/sql/nullcheck_table.sql
@@ -1,4 +1,8 @@
 {% macro nullcheck_table(relation) %}
+    {{ adapter.dispatch('nullcheck_table', packages = dbt_utils._get_utils_namespaces())(relation) }}
+{% endmacro %}
+
+{% macro default__nullcheck_table(relation) %}
 
   {%- do dbt_utils._is_relation(relation, 'nullcheck_table') -%}
   {%- do dbt_utils._is_ephemeral(relation, 'nullcheck_table') -%}

diff --git a/macros/sql/pivot.sql b/macros/sql/pivot.sql
@@ -51,6 +51,20 @@ Arguments:
                else_value=0,
                quote_identifiers=True,
                distinct=False) %}
+    {{ adapter.dispatch('pivot', packages = dbt_utils._get_utils_namespaces())(column, values, alias=True, agg='sum', cmp='=', prefix='', suffix='', then_value=1, else_value=0, quote_identifiers=True, distinct=False) }}
+{% endmacro %}
+
+{% macro default__pivot(column,
+               values,
+               alias=True,
+               agg='sum',
+               cmp='=',
+               prefix='',
+               suffix='',
+               then_value=1,
+               else_value=0,
+               quote_identifiers=True,
+               distinct=False) %}
   {% for v in values %}
     {{ agg }}(
       {% if distinct %} distinct {% endif %}

diff --git a/macros/sql/safe_add.sql b/macros/sql/safe_add.sql
@@ -1,4 +1,8 @@
 {%- macro safe_add() -%}
+    {{ adapter.dispatch('safe_add', packages = dbt_utils._get_utils_namespaces())() }}
+{% endmacro %}
+
+{%- macro default__safe_add() -%}
 
 {% set fields = [] %}
 

diff --git a/macros/sql/star.sql b/macros/sql/star.sql
@@ -1,5 +1,8 @@
 {% macro star(from, relation_alias=False, except=[]) -%}
+    {{ adapter.dispatch('star', packages = dbt_utils._get_utils_namespaces())(from, relation_alias=False, except=[]) }}
+{% endmacro %}
 
+{% macro default__star(from, relation_alias=False, except=[]) -%}
     {%- do dbt_utils._is_relation(from, 'star') -%}
     {%- do dbt_utils._is_ephemeral(from, 'star') -%}
 

diff --git a/macros/sql/surrogate_key.sql b/macros/sql/surrogate_key.sql
@@ -1,4 +1,8 @@
 {%- macro surrogate_key(field_list) -%}
+    {{ adapter.dispatch('surrogate_key', packages = dbt_utils._get_utils_namespaces())(field_list) }}
+{% endmacro %}
+
+{%- macro default__surrogate_key(field_list) -%}
 
 {%- if varargs|length >= 1 or field_list is string %}
 

diff --git a/macros/sql/union.sql b/macros/sql/union.sql
@@ -1,4 +1,8 @@
 {%- macro union_relations(relations, column_override=none, include=[], exclude=[], source_column_name='_dbt_source_relation') -%}
+    {{ adapter.dispatch('union_relations', packages = dbt_utils._get_utils_namespaces())(relations, column_override=none, include=[], exclude=[], source_column_name='_dbt_source_relation') }}
+{% endmacro %}
+
+{%- macro default__union_relations(relations, column_override=none, include=[], exclude=[], source_column_name='_dbt_source_relation') -%}
 
     {%- if exclude and include -%}
         {{ exceptions.raise_compiler_error("Both an exclude and include list were provided to the `union` macro. Only one is allowed") }}

diff --git a/macros/sql/unpivot.sql b/macros/sql/unpivot.sql
@@ -13,6 +13,10 @@ Arguments:
 #}
 
 {% macro unpivot(relation=none, cast_to='varchar', exclude=none, remove=none, field_name='field_name', value_name='value', table=none) -%}
+    {{ adapter.dispatch('unpivot', packages = dbt_utils._get_utils_namespaces())(relation=none, cast_to='varchar', exclude=none, remove=none, field_name='field_name', value_name='value', table=none) }}
+{% endmacro %}
+
+{% macro default__unpivot(relation=none, cast_to='varchar', exclude=none, remove=none, field_name='field_name', value_name='value', table=none) -%}
 
     {% if table %}
         {%- set error_message = '

diff --git a/macros/web/get_url_host.sql b/macros/web/get_url_host.sql
@@ -1,4 +1,8 @@
 {% macro get_url_host(field) -%}
+    {{ adapter.dispatch('get_url_host', packages = dbt_utils._get_utils_namespaces())(field) }}
+{% endmacro %}
+
+{% macro default__get_url_host(field) -%}
 
 {%- set parsed = 
     dbt_utils.split_part(

diff --git a/macros/web/get_url_parameter.sql b/macros/web/get_url_parameter.sql
@@ -1,4 +1,8 @@
 {% macro get_url_parameter(field, url_parameter) -%}
+    {{ adapter.dispatch('get_url_parameter', packages = dbt_utils._get_utils_namespaces())(field, url_parameter) }}
+{% endmacro %}
+
+{% macro default__get_url_parameter(field, url_parameter) -%}
 
 {%- set formatted_url_parameter = "'" + url_parameter + "='" -%}
 

diff --git a/macros/web/get_url_path.sql b/macros/web/get_url_path.sql
@@ -1,4 +1,8 @@
 {% macro get_url_path(field) -%}
+    {{ adapter.dispatch('get_url_path', packages = dbt_utils._get_utils_namespaces())(field) }}
+{% endmacro %}
+
+{% macro default__get_url_path(field) -%}
 
     {%- set stripped_url = 
         dbt_utils.replace(