Merge pull request #312 from swanderz/dispatch-ify-schema-tests

dispatch-ify ALL THE MACROS!
dbt-labs · Jan 10, 2021 · c64b520 · c64b520
2 parents 86cb6eb + 20034bd
commit c64b520
Show file tree

Hide file tree

Showing 57 changed files with 199 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Speed up CI via threads, workflows ([#315](https://github.com/fishtown-analytics/dbt-utils/pull/315), [#316](https://github.com/fishtown-analytics/dbt-utils/pull/316))
 - Fix `equality` test when used with ephemeral models + explicit column set ([#321](https://github.com/fishtown-analytics/dbt-utils/pull/321))
 - Fix `get_query_results_as_dict` integration test with consistent ordering ([#322](https://github.com/fishtown-analytics/dbt-utils/pull/322))
+- All macros are now properly dispatched, making it possible for non-core adapters to implement a shim package for dbt-utils ([#312](https://github.com/fishtown-analytics/dbt-utils/pull/312)) Thanks [@chaerinlee1](https://github.com/chaerinlee1) and [@swanderz](https://github.com/swanderz)
 
 # dbt-utils v0.6.3
 

diff --git a/macros/cross_db_utils/concat.sql b/macros/cross_db_utils/concat.sql
@@ -1,7 +1,7 @@
 
 
 {% macro concat(fields) -%}
-  {{ adapter.dispatch('concat', packages = dbt_utils._get_utils_namespaces())(fields) }}
+  {{ return(adapter.dispatch('concat', packages = dbt_utils._get_utils_namespaces())(fields)) }}
 {%- endmacro %}
 
 {% macro default__concat(fields) -%}

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.dispatch('current_timestamp', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('current_timestamp', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro %}
 
 {% macro default__current_timestamp() %}
@@ -17,7 +17,7 @@
 
 
 {% macro current_timestamp_in_utc() -%}
-  {{ adapter.dispatch('current_timestamp_in_utc', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('current_timestamp_in_utc', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro %}
 
 {% macro default__current_timestamp_in_utc() %}

diff --git a/macros/cross_db_utils/datatypes.sql b/macros/cross_db_utils/datatypes.sql
@@ -1,7 +1,7 @@
 {# string  -------------------------------------------------     #}
 
 {%- macro type_string() -%}
-  {{ adapter.dispatch('type_string', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_string', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_string() %}
@@ -25,7 +25,7 @@
 {# timestamp  -------------------------------------------------     #}
 
 {%- macro type_timestamp() -%}
-  {{ adapter.dispatch('type_timestamp', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_timestamp', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_timestamp() %}
@@ -40,7 +40,7 @@
 {# float  -------------------------------------------------     #}
 
 {%- macro type_float() -%}
-  {{ adapter.dispatch('type_float', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_float', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_float() %}
@@ -54,7 +54,7 @@
 {# numeric  ------------------------------------------------     #}
 
 {%- macro type_numeric() -%}
-  {{ adapter.dispatch('type_numeric', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_numeric', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_numeric() %}
@@ -69,7 +69,7 @@
 {# bigint  -------------------------------------------------     #}
 
 {%- macro type_bigint() -%}
-  {{ adapter.dispatch('type_bigint', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_bigint', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_bigint() %}
@@ -83,7 +83,7 @@
 {# int  -------------------------------------------------     #}
 
 {%- macro type_int() -%}
-  {{ adapter.dispatch('type_int', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('type_int', packages = dbt_utils._get_utils_namespaces())()) }}
 {%- endmacro -%}
 
 {% macro default__type_int() %}

diff --git a/macros/cross_db_utils/date_trunc.sql b/macros/cross_db_utils/date_trunc.sql
@@ -1,5 +1,5 @@
 {% macro date_trunc(datepart, date) -%}
-  {{ adapter.dispatch('date_trunc', packages = dbt_utils._get_utils_namespaces()) (datepart, date) }}
+  {{ return(adapter.dispatch('date_trunc', packages = dbt_utils._get_utils_namespaces()) (datepart, date)) }}
 {%- endmacro %}
 
 {% macro default__date_trunc(datepart, date) %}

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.dispatch('dateadd', packages = dbt_utils._get_utils_namespaces())(datepart, interval, from_date_or_timestamp) }}
+  {{ return(adapter.dispatch('dateadd', packages = dbt_utils._get_utils_namespaces())(datepart, interval, from_date_or_timestamp)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/datediff.sql b/macros/cross_db_utils/datediff.sql
@@ -1,5 +1,5 @@
 {% macro datediff(first_date, second_date, datepart) %}
-  {{ adapter.dispatch('datediff', packages = dbt_utils._get_utils_namespaces())(first_date, second_date, datepart) }}
+  {{ return(adapter.dispatch('datediff', packages = dbt_utils._get_utils_namespaces())(first_date, second_date, datepart)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/except.sql b/macros/cross_db_utils/except.sql
@@ -1,5 +1,5 @@
 {% macro except() %}
-  {{ adapter.dispatch('except', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('except', packages = dbt_utils._get_utils_namespaces())()) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/hash.sql b/macros/cross_db_utils/hash.sql
@@ -1,5 +1,5 @@
 {% macro hash(field) -%}
-  {{ adapter.dispatch('hash', packages = dbt_utils._get_utils_namespaces()) (field) }}
+  {{ return(adapter.dispatch('hash', packages = dbt_utils._get_utils_namespaces()) (field)) }}
 {%- endmacro %}
 
 

diff --git a/macros/cross_db_utils/identifier.sql b/macros/cross_db_utils/identifier.sql
@@ -4,7 +4,7 @@
     Use `adapter.quote` instead. The {}.{} model triggered this warning. \
     '.format(model.package_name, model.name) -%}
   {%- do exceptions.warn(error_message) -%}
-  {{ adapter.dispatch('identifier', packages = dbt_utils._get_utils_namespaces()) (value) }}
+  {{ return(adapter.dispatch('identifier', packages = dbt_utils._get_utils_namespaces()) (value)) }}
 {% endmacro %}	
 
 {% macro default__identifier(value) -%}	

diff --git a/macros/cross_db_utils/intersect.sql b/macros/cross_db_utils/intersect.sql
@@ -1,5 +1,5 @@
 {% macro intersect() %}
-  {{ adapter.dispatch('intersect', packages = dbt_utils._get_utils_namespaces())() }}
+  {{ return(adapter.dispatch('intersect', packages = dbt_utils._get_utils_namespaces())()) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/last_day.sql b/macros/cross_db_utils/last_day.sql
@@ -4,7 +4,7 @@ testing is required to validate that it will work on other dateparts.
 */
 
 {% macro last_day(date, datepart) %}
-  {{ adapter.dispatch('last_day', packages = dbt_utils._get_utils_namespaces()) (date, datepart) }}
+  {{ return(adapter.dispatch('last_day', packages = dbt_utils._get_utils_namespaces()) (date, datepart)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/length.sql b/macros/cross_db_utils/length.sql
@@ -1,5 +1,5 @@
 {% macro length(expression) -%}
-    {{ adapter.dispatch('length', packages = dbt_utils._get_utils_namespaces()) (expression) }}
+    {{ return(adapter.dispatch('length', packages = dbt_utils._get_utils_namespaces()) (expression)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/literal.sql b/macros/cross_db_utils/literal.sql
@@ -1,6 +1,6 @@
 
 {%- macro string_literal(value) -%}
-  {{ adapter.dispatch('string_literal', packages = dbt_utils._get_utils_namespaces()) (value) }}
+  {{ return(adapter.dispatch('string_literal', packages = dbt_utils._get_utils_namespaces()) (value)) }}
 {%- endmacro -%}
 
 {% macro default__string_literal(value) -%}

diff --git a/macros/cross_db_utils/position.sql b/macros/cross_db_utils/position.sql
@@ -1,5 +1,5 @@
 {% macro position(substring_text, string_text) -%}
-    {{ adapter.dispatch('position', packages = dbt_utils._get_utils_namespaces()) (substring_text, string_text) }}
+    {{ return(adapter.dispatch('position', packages = dbt_utils._get_utils_namespaces()) (substring_text, string_text)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/replace.sql b/macros/cross_db_utils/replace.sql
@@ -1,5 +1,5 @@
 {% macro replace(field, old_chars, new_chars) -%}
-    {{ adapter.dispatch('replace', packages = dbt_utils._get_utils_namespaces()) (field, old_chars, new_chars) }}
+    {{ return(adapter.dispatch('replace', packages = dbt_utils._get_utils_namespaces()) (field, old_chars, new_chars)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/right.sql b/macros/cross_db_utils/right.sql
@@ -1,5 +1,5 @@
 {% macro right(string_text, length_expression) -%}
-    {{ adapter.dispatch('right', packages = dbt_utils._get_utils_namespaces()) (string_text, length_expression) }}
+    {{ return(adapter.dispatch('right', packages = dbt_utils._get_utils_namespaces()) (string_text, length_expression)) }}
 {% endmacro %}
 
 {% macro default__right(string_text, length_expression) %}

diff --git a/macros/cross_db_utils/safe_cast.sql b/macros/cross_db_utils/safe_cast.sql
@@ -1,5 +1,5 @@
 {% macro safe_cast(field, type) %}
-  {{ adapter.dispatch('safe_cast', packages = dbt_utils._get_utils_namespaces()) (field, type) }}
+  {{ return(adapter.dispatch('safe_cast', packages = dbt_utils._get_utils_namespaces()) (field, type)) }}
 {% 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.dispatch('split_part', packages = dbt_utils._get_utils_namespaces()) (string_text, delimiter_text, part_number) }}
+  {{ return(adapter.dispatch('split_part', packages = dbt_utils._get_utils_namespaces()) (string_text, delimiter_text, part_number)) }}
 {% endmacro %}
 
 

diff --git a/macros/cross_db_utils/width_bucket.sql b/macros/cross_db_utils/width_bucket.sql
@@ -1,5 +1,5 @@
 {% macro width_bucket(expr, min_value, max_value, num_buckets) %}
-  {{ adapter.dispatch('width_bucket', packages = dbt_utils._get_utils_namespaces()) (expr, min_value, max_value, num_buckets) }}
+  {{ return(adapter.dispatch('width_bucket', packages = dbt_utils._get_utils_namespaces()) (expr, min_value, max_value, num_buckets)) }}
 {% endmacro %}
 
 

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) -%}
+    {{ return(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) %}
+    {{ return(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) -%}
+    {{ return(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/logger/log_info.sql b/macros/logger/log_info.sql
@@ -1,5 +1,7 @@
 {% macro log_info(message) %}
+    {{ return(adapter.dispatch('log_info', packages = dbt_utils._get_utils_namespaces())(message)) }}
+{% endmacro %}
 
+{% macro default__log_info(message) %}
     {{ log(dbt_utils.pretty_log_format(message), info=True) }}
-
 {% endmacro %}
diff --git a/macros/logger/pretty_log_format.sql b/macros/logger/pretty_log_format.sql
@@ -1,5 +1,7 @@
 {% macro pretty_log_format(message) %}
+    {{ return(adapter.dispatch('pretty_log_format', packages = dbt_utils._get_utils_namespaces())(message)) }}
+{% endmacro %}
 
+{% macro default__pretty_log_format(message) %}
     {{ return( dbt_utils.pretty_time() ~ ' + ' ~ message) }}
-
 {% endmacro %}
diff --git a/macros/logger/pretty_time.sql b/macros/logger/pretty_time.sql
@@ -1,5 +1,7 @@
 {% macro pretty_time(format='%H:%M:%S') %}
+    {{ return(adapter.dispatch('pretty_time', packages = dbt_utils._get_utils_namespaces())(format)) }}
+{% endmacro %}
 
+{% macro default__pretty_time(format='%H:%M:%S') %}
     {{ return(modules.datetime.datetime.now().strftime(format)) }}
-
 {% endmacro %}
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) -%}
+    {{ return(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 (
@@ -25,6 +29,10 @@
 {%- endmacro %}
 
 {% macro get_period_sql(target_cols_csv, sql, timestamp_field, period, start_timestamp, stop_timestamp, offset) -%}
+    {{ return(adapter.dispatch('get_period_sql', packages = dbt_utils._get_utils_namespaces())(target_cols_csv, sql, timestamp_field, period, start_timestamp, stop_timestamp, offset)) }}
+{% endmacro %}
+
+{% macro default__get_period_sql(target_cols_csv, sql, timestamp_field, period, start_timestamp, stop_timestamp, offset) -%}
 
   {%- set period_filter -%}
     ("{{timestamp_field}}" >  '{{start_timestamp}}'::timestamp + interval '{{offset}} {{period}}' and

diff --git a/macros/schema_tests/at_least_one.sql b/macros/schema_tests/at_least_one.sql
@@ -1,4 +1,8 @@
 {% macro test_at_least_one(model) %}
+  {{ return(adapter.dispatch('test_at_least_one', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_at_least_one(model) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 
@@ -14,4 +18,4 @@ from (
 
 ) validation_errors
 
-{% endmacro %}
+{% endmacro %}
diff --git a/macros/schema_tests/cardinality_equality.sql b/macros/schema_tests/cardinality_equality.sql
@@ -1,4 +1,9 @@
 {% macro test_cardinality_equality(model, to, field) %}
+    {{ return(adapter.dispatch('test_cardinality_equality', packages = dbt_utils._get_utils_namespaces())(model, to, field, **kwargs)) }}
+
+{% endmacro %}
+
+{% macro default__test_cardinality_equality(model, to, field) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('from')) %}
 

diff --git a/macros/schema_tests/equal_rowcount.sql b/macros/schema_tests/equal_rowcount.sql
@@ -1,4 +1,8 @@
 {% macro test_equal_rowcount(model) %}
+  {{ return(adapter.dispatch('test_equal_rowcount', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_equal_rowcount(model) %}
 
 {% set compare_model = kwargs.get('compare_model', kwargs.get('arg')) %}
 

diff --git a/macros/schema_tests/equality.sql b/macros/schema_tests/equality.sql
@@ -1,4 +1,8 @@
 {% macro test_equality(model) %}
+  {{ return(adapter.dispatch('test_equality', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_equality(model) %}
 
 
 {#-- Prevent querying of db in parsing mode. This works because this macro does not create any new refs. #}

diff --git a/macros/schema_tests/expression_is_true.sql b/macros/schema_tests/expression_is_true.sql
@@ -1,4 +1,8 @@
 {% macro test_expression_is_true(model, condition='true') %}
+  {{ return(adapter.dispatch('test_expression_is_true', packages = dbt_utils._get_utils_namespaces())(model, condition, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_expression_is_true(model, condition='true') %}
 
 {% set expression = kwargs.get('expression', kwargs.get('arg')) %}
 

diff --git a/macros/schema_tests/mutually_exclusive_ranges.sql b/macros/schema_tests/mutually_exclusive_ranges.sql
@@ -1,4 +1,8 @@
 {% macro test_mutually_exclusive_ranges(model, lower_bound_column, upper_bound_column, partition_by=None, gaps='allowed') %}
+  {{ return(adapter.dispatch('test_mutually_exclusive_ranges', packages = dbt_utils._get_utils_namespaces())(model, lower_bound_column, upper_bound_column, partition_by, gaps)) }}
+{% endmacro %}
+
+{% macro default__test_mutually_exclusive_ranges(model, lower_bound_column, upper_bound_column, partition_by=None, gaps='allowed') %}
 
 {% if gaps == 'not_allowed' %}
     {% set allow_gaps_operator='=' %}

diff --git a/macros/schema_tests/not_constant.sql b/macros/schema_tests/not_constant.sql
@@ -1,5 +1,9 @@
 
 {% macro test_not_constant(model) %}
+  {{ return(adapter.dispatch('test_not_constant', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_not_constant(model) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 

diff --git a/macros/schema_tests/recency.sql b/macros/schema_tests/recency.sql
@@ -1,4 +1,8 @@
 {% macro test_recency(model, datepart, interval) %}
+  {{ return(adapter.dispatch('test_recency', packages = dbt_utils._get_utils_namespaces())(model, datepart, interval, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_recency(model, datepart, interval) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('field')) %}
 

diff --git a/macros/schema_tests/relationships_where.sql b/macros/schema_tests/relationships_where.sql
@@ -1,4 +1,8 @@
 {% macro test_relationships_where(model, to, field) %}
+  {{ return(adapter.dispatch('test_relationships_where', packages = dbt_utils._get_utils_namespaces())(model, to, field, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_relationships_where(model, to, field) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('from')) %}
 {% set from_condition = kwargs.get('from_condition', "true") %}

diff --git a/macros/schema_tests/test_not_null_where.sql b/macros/schema_tests/test_not_null_where.sql
@@ -1,4 +1,8 @@
 {% macro test_not_null_where(model) %}
+  {{ return(adapter.dispatch('test_not_null_where', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_not_null_where(model) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 {% set where = kwargs.get('where', kwargs.get('arg')) %}

diff --git a/macros/schema_tests/test_unique_where.sql b/macros/schema_tests/test_unique_where.sql
@@ -1,4 +1,8 @@
 {% macro test_unique_where(model) %}
+  {{ return(adapter.dispatch('test_unique_where', packages = dbt_utils._get_utils_namespaces())(model, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_unique_where(model) %}
 
 {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 {% set where = kwargs.get('where', kwargs.get('arg')) %}

diff --git a/macros/schema_tests/unique_combination_of_columns.sql b/macros/schema_tests/unique_combination_of_columns.sql
@@ -1,4 +1,8 @@
 {% macro test_unique_combination_of_columns(model, quote_columns = false) %}
+  {{ return(adapter.dispatch('test_unique_combination_of_columns', packages = dbt_utils._get_utils_namespaces())(model, quote_columns, **kwargs)) }}
+{% endmacro %}
+
+{% macro default__test_unique_combination_of_columns(model, quote_columns = false) %}
 
 {%- set columns = kwargs.get('combination_of_columns', kwargs.get('arg')) %}