Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration_tests/macros/limit_zero.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% macro my_custom_macro() %} whatever {% endmacro %}

{% macro limit_zero() %}
{{ return adapter.dispatch("limit_zero", "dbt_utils")() }}
{{ return(adapter.dispatch("limit_zero", "dbt_utils")()) }}
{% endmacro %}

{% macro default__limit_zero() %} {{ return "limit 0" }} {% endmacro %}
{% macro default__limit_zero() %} {{ return("limit 0") }} {% endmacro %}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% set exclude_field = "field_1" %}
{% set column_names = dbt_utils.get_filtered_columns_in_relation(from= ref('data_filtered_columns_in_relation'), except=[exclude_field]) %}
{% set column_names = dbt_utils.get_filtered_columns_in_relation(
from=ref("data_filtered_columns_in_relation"), except=[exclude_field]
) %}

with
data as (
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/models/sql/test_star.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
with
data as (

select {{ dbt_utils.star(from=ref('data_star'), except=[exclude_field]) }}
select {{ dbt_utils.star(from=ref("data_star"), except=[exclude_field]) }}

from {{ ref("data_star") }}

Expand Down
4 changes: 3 additions & 1 deletion integration_tests/models/sql/test_star_aggregate.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* This test checks that column aliases aren't applied unless there's a prefix/suffix necessary, to ensure that GROUP BYs keep working*/
{% set selected_columns = dbt_utils.star(from=ref('data_star_aggregate'), except=['value_field']) %}
{% set selected_columns = dbt_utils.star(
from=ref("data_star_aggregate"), except=["value_field"]
) %}

with
data as (
Expand Down
6 changes: 5 additions & 1 deletion integration_tests/models/sql/test_star_prefix_suffix.sql
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ with
data as (

select
{{ dbt_utils.star(from=ref('data_star'), prefix=prefix_with, suffix=suffix_with) }}
{{
dbt_utils.star(
from=ref("data_star"), prefix=prefix_with, suffix=suffix_with
)
}}

from {{ ref("data_star") }}

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/models/sql/test_star_uppercase.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
with
data as (

select {{ dbt_utils.star(from=ref('data_star'), except=[exclude_field]) }}
select {{ dbt_utils.star(from=ref("data_star"), except=[exclude_field]) }}

from {{ ref("data_star") }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,14 @@
For reasons that remain unclear, Jinja won't return True for actual_dictionary == expected_dictionary.
Instead, we'll manually check that the values of these dictionaries are equivalent.
-#}
{% set ns = namespace(
pass=True,
err_msg = ""
) %}
{% set ns = namespace(pass=True, err_msg="") %}
{% if execute %}
{#- Check that the dictionaries have the same keys -#}
{% set expected_keys = expected_dictionary.keys() | list | sort %}
{% set actual_keys = actual_dictionary.keys() | list | sort %}

{% if expected_keys != actual_keys %}
{% set ns.pass=False %}
{% set ns.pass = False %}
{% set ns.err_msg %}
The two dictionaries have different keys:
expected_dictionary has keys: {{ expected_keys }}
Expand All @@ -46,7 +43,7 @@ Instead, we'll manually check that the values of these dictionaries are equivale
{% set actual_length = actual_dictionary[key] | length %}

{% if expected_length != actual_length %}
{% set ns.pass=False %}
{% set ns.pass = False %}
{% set ns.err_msg %}
The {{ key }} column has different lengths:
expected_dictionary[{{ key }}] has length {{ expected_length }}
Expand All @@ -59,7 +56,7 @@ Instead, we'll manually check that the values of these dictionaries are equivale
{% set expected_value = expected_dictionary[key][i] %}
{% set actual_value = actual_dictionary[key][i] %}
{% if expected_value != actual_value %}
{% set ns.pass=False %}
{% set ns.pass = False %}
{% set ns.err_msg %}
The {{ key }} column has differing values:
expected_dictionary[{{ key }}][{{ i }}] == {{ expected_value }}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/any_value.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro any_value(expression) -%}
{{ return adapter.dispatch("any_value", "dbt_utils")(expression) }}
{{ return(adapter.dispatch("any_value", "dbt_utils")(expression)) }}
{% endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/bool_or.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro bool_or(expression) -%}
{{ return adapter.dispatch("bool_or", "dbt_utils")(expression) }}
{{ return(adapter.dispatch("bool_or", "dbt_utils")(expression)) }}
{% endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/concat.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


{% macro concat(fields) -%}
{{ return adapter.dispatch("concat", "dbt_utils")(fields) }}
{{ return(adapter.dispatch("concat", "dbt_utils")(fields)) }}
{%- endmacro %}

{% macro default__concat(fields) -%} {{ fields | join(" || ") }} {%- endmacro %}
6 changes: 3 additions & 3 deletions macros/cross_db_utils/current_timestamp.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro current_timestamp() -%}
{{ return adapter.dispatch("current_timestamp", "dbt_utils")() }}
{{ return(adapter.dispatch("current_timestamp", "dbt_utils")()) }}
{%- endmacro %}

{% macro default__current_timestamp() %}
Expand All @@ -13,7 +13,7 @@ current_timestamp::{{ dbt_utils.type_timestamp() }}


{% macro current_timestamp_in_utc() -%}
{{ return adapter.dispatch("current_timestamp_in_utc", "dbt_utils")() }}
{{ return(adapter.dispatch("current_timestamp_in_utc", "dbt_utils")()) }}
{%- endmacro %}

{% macro default__current_timestamp_in_utc() %}
Expand All @@ -32,5 +32,5 @@ convert_timezone(

{# redshift should use default instead of postgres #}
{% macro redshift__current_timestamp_in_utc() %}
{{ return dbt_utils.default__current_timestamp_in_utc() }}
{{ return(dbt_utils.default__current_timestamp_in_utc()) }}
{% endmacro %}
12 changes: 6 additions & 6 deletions macros/cross_db_utils/datatypes.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{# string ------------------------------------------------- #}
{%- macro type_string() -%}
{{ return adapter.dispatch("type_string", "dbt_utils")() }}
{{ return(adapter.dispatch("type_string", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_string() %} string {% endmacro %}
Expand All @@ -15,7 +15,7 @@

{# timestamp ------------------------------------------------- #}
{%- macro type_timestamp() -%}
{{ return adapter.dispatch("type_timestamp", "dbt_utils")() }}
{{ return(adapter.dispatch("type_timestamp", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_timestamp() %} timestamp {% endmacro %}
Expand All @@ -27,7 +27,7 @@

{# float ------------------------------------------------- #}
{%- macro type_float() -%}
{{ return adapter.dispatch("type_float", "dbt_utils")() }}
{{ return(adapter.dispatch("type_float", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_float() %} float {% endmacro %}
Expand All @@ -36,7 +36,7 @@

{# numeric ------------------------------------------------ #}
{%- macro type_numeric() -%}
{{ return adapter.dispatch("type_numeric", "dbt_utils")() }}
{{ return(adapter.dispatch("type_numeric", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_numeric() %} numeric(28, 6) {% endmacro %}
Expand All @@ -46,7 +46,7 @@

{# bigint ------------------------------------------------- #}
{%- macro type_bigint() -%}
{{ return adapter.dispatch("type_bigint", "dbt_utils")() }}
{{ return(adapter.dispatch("type_bigint", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_bigint() %} bigint {% endmacro %}
Expand All @@ -55,7 +55,7 @@

{# int ------------------------------------------------- #}
{%- macro type_int() -%}
{{ return adapter.dispatch("type_int", "dbt_utils")() }}
{{ return(adapter.dispatch("type_int", "dbt_utils")()) }}
{%- endmacro -%}

{% macro default__type_int() %} int {% endmacro %}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/date_trunc.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro date_trunc(datepart, date) -%}
{{ return adapter.dispatch("date_trunc", "dbt_utils")(datepart, date) }}
{{ return(adapter.dispatch("date_trunc", "dbt_utils")(datepart, date)) }}
{%- endmacro %}

{% macro default__date_trunc(datepart, date) -%}
Expand Down
8 changes: 5 additions & 3 deletions macros/cross_db_utils/dateadd.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{% macro dateadd(datepart, interval, from_date_or_timestamp) %}
{{
return adapter.dispatch("dateadd", "dbt_utils")(
datepart, interval, from_date_or_timestamp
return(
adapter.dispatch("dateadd", "dbt_utils")(
datepart, interval, from_date_or_timestamp
)
)
}}
{% endmacro %}
Expand Down Expand Up @@ -32,6 +34,6 @@ datetime_add(
{# redshift should use default instead of postgres #}
{% macro redshift__dateadd(datepart, interval, from_date_or_timestamp) %}

{{ return dbt_utils.default__dateadd(datepart, interval, from_date_or_timestamp) }}
{{ return(dbt_utils.default__dateadd(datepart, interval, from_date_or_timestamp)) }}

{% endmacro %}
8 changes: 6 additions & 2 deletions macros/cross_db_utils/datediff.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{% macro datediff(first_date, second_date, datepart) %}
{{ return adapter.dispatch("datediff", "dbt_utils")(first_date, second_date, datepart) }}
{{
return(
adapter.dispatch("datediff", "dbt_utils")(first_date, second_date, datepart)
)
}}
{% endmacro %}


Expand Down Expand Up @@ -96,6 +100,6 @@ datetime_diff(
{# redshift should use default instead of postgres #}
{% macro redshift__datediff(first_date, second_date, datepart) -%}

{{ return dbt_utils.default__datediff(first_date, second_date, datepart) }}
{{ return(dbt_utils.default__datediff(first_date, second_date, datepart)) }}

{%- endmacro %}
2 changes: 1 addition & 1 deletion macros/cross_db_utils/escape_single_quotes.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro escape_single_quotes(expression) %}
{{ return adapter.dispatch("escape_single_quotes", "dbt_utils")(expression) }}
{{ return(adapter.dispatch("escape_single_quotes", "dbt_utils")(expression)) }}
{% endmacro %}

{# /*Default to replacing a single apostrophe with two apostrophes: they're -> they''re*/ #}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/except.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro except() %}
{{ return adapter.dispatch("except", "dbt_utils")() }}
{{ return(adapter.dispatch("except", "dbt_utils")()) }}
{% endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/hash.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro hash(field) -%}
{{ return adapter.dispatch("hash", "dbt_utils")(field) }}
{{ return(adapter.dispatch("hash", "dbt_utils")(field)) }}
{%- endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/identifier.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
model.package_name, model.name
) -%}
{%- do exceptions.warn(error_message) -%}
{{ return adapter.dispatch("identifier", "dbt_utils")(value) }}
{{ return(adapter.dispatch("identifier", "dbt_utils")(value)) }}
{% endmacro %}

{% macro default__identifier(value) -%} "{{ value }}" {%- endmacro %}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/intersect.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro intersect() %}
{{ return adapter.dispatch("intersect", "dbt_utils")() }}
{{ return(adapter.dispatch("intersect", "dbt_utils")()) }}
{% endmacro %}


Expand Down
4 changes: 2 additions & 2 deletions macros/cross_db_utils/last_day.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ This function has been tested with dateparts of month and quarters. Further
testing is required to validate that it will work on other dateparts.
*/
{% macro last_day(date, datepart) %}
{{ return adapter.dispatch("last_day", "dbt_utils")(date, datepart) }}
{{ return(adapter.dispatch("last_day", "dbt_utils")(date, datepart)) }}
{% endmacro %}


Expand Down Expand Up @@ -46,6 +46,6 @@ cast(
{# redshift should use default instead of postgres #}
{% macro redshift__last_day(date, datepart) %}

{{ return dbt_utils.default__last_day(date, datepart) }}
{{ return(dbt_utils.default__last_day(date, datepart)) }}

{% endmacro %}
2 changes: 1 addition & 1 deletion macros/cross_db_utils/length.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro length(expression) -%}
{{ return adapter.dispatch("length", "dbt_utils")(expression) }}
{{ return(adapter.dispatch("length", "dbt_utils")(expression)) }}
{% endmacro %}


Expand Down
6 changes: 4 additions & 2 deletions macros/cross_db_utils/listagg.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
measure, delimiter_text="','", order_by_clause=none, limit_num=none
) -%}
{{
return adapter.dispatch("listagg", "dbt_utils")(
measure, delimiter_text, order_by_clause, limit_num
return(
adapter.dispatch("listagg", "dbt_utils")(
measure, delimiter_text, order_by_clause, limit_num
)
)
}}
{%- endmacro %}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/literal.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

{%- macro string_literal(value) -%}
{{ return adapter.dispatch("string_literal", "dbt_utils")(value) }}
{{ return(adapter.dispatch("string_literal", "dbt_utils")(value)) }}
{%- endmacro -%}

{% macro default__string_literal(value) -%} '{{ value }}' {%- endmacro %}
2 changes: 1 addition & 1 deletion macros/cross_db_utils/position.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro position(substring_text, string_text) -%}
{{ return adapter.dispatch("position", "dbt_utils")(substring_text, string_text) }}
{{ return(adapter.dispatch("position", "dbt_utils")(substring_text, string_text)) }}
{% endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/replace.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro replace(field, old_chars, new_chars) -%}
{{ return adapter.dispatch("replace", "dbt_utils")(field, old_chars, new_chars) }}
{{ return(adapter.dispatch("replace", "dbt_utils")(field, old_chars, new_chars)) }}
{% endmacro %}


Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/right.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro right(string_text, length_expression) -%}
{{ return adapter.dispatch("right", "dbt_utils")(string_text, length_expression) }}
{{ return(adapter.dispatch("right", "dbt_utils")(string_text, length_expression)) }}
{% endmacro %}

{% macro default__right(string_text, length_expression) %}
Expand Down
2 changes: 1 addition & 1 deletion macros/cross_db_utils/safe_cast.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% macro safe_cast(field, type) %}
{{ return adapter.dispatch("safe_cast", "dbt_utils")(field, type) }}
{{ return(adapter.dispatch("safe_cast", "dbt_utils")(field, type)) }}
{% endmacro %}


Expand Down
6 changes: 4 additions & 2 deletions macros/cross_db_utils/split_part.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{% macro split_part(string_text, delimiter_text, part_number) %}
{{
return adapter.dispatch("split_part", "dbt_utils")(
string_text, delimiter_text, part_number
return(
adapter.dispatch("split_part", "dbt_utils")(
string_text, delimiter_text, part_number
)
)
}}
{% endmacro %}
Expand Down
6 changes: 4 additions & 2 deletions macros/cross_db_utils/width_bucket.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{% macro width_bucket(expr, min_value, max_value, num_buckets) %}
{{
return adapter.dispatch("width_bucket", "dbt_utils")(
expr, min_value, max_value, num_buckets
return(
adapter.dispatch("width_bucket", "dbt_utils")(
expr, min_value, max_value, num_buckets
)
)
}}
{% endmacro %}
Expand Down
6 changes: 4 additions & 2 deletions macros/generic_tests/accepted_range.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
model, column_name, min_value=none, max_value=none, inclusive=true
) %}
{{
return adapter.dispatch("test_accepted_range", "dbt_utils")(
model, column_name, min_value, max_value, inclusive
return(
adapter.dispatch("test_accepted_range", "dbt_utils")(
model, column_name, min_value, max_value, inclusive
)
)
}}
{% endtest %}
Expand Down
2 changes: 1 addition & 1 deletion macros/generic_tests/at_least_one.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% test at_least_one(model, column_name) %}
{{ return adapter.dispatch("test_at_least_one", "dbt_utils")(model, column_name) }}
{{ return(adapter.dispatch("test_at_least_one", "dbt_utils")(model, column_name)) }}
{% endtest %}

{% macro default__test_at_least_one(model, column_name) %}
Expand Down
Loading