chore/apply 717530c

integration_tests/macros/assert_equal_values.sql

@@ -1,11 +1,10 @@
 {% macro assert_equal_values(actual_object, expected_object) %}
-{% if not execute %}
+    {% if not execute %}
 
     {# pass #}
+    {% elif actual_object != expected_object %}
 
-{% elif actual_object != expected_object %}
-
-    {% set msg %}
+        {% set msg %}
     Expected did not match actual
 
     -----------
@@ -18,15 +17,13 @@
     -----------
     --->{{ expected_object }}<---
 
-    {% endset %}
-
-    {{ log(msg, info=True) }}
+        {% endset %}
 
-    select 'fail'
+        {{ log(msg, info=True) }}
 
-{% else %}
+        select 'fail'
 
-    select 'ok' {{ limit_zero() }}
+    {% else %} select 'ok' {{ limit_zero() }}
 
-{% endif %}
-{% endmacro %}
+    {% endif %}
+{% endmacro %}

integration_tests/macros/limit_zero.sql

@@ -1,11 +1,7 @@
-{% macro my_custom_macro() %}
-    whatever
-{% endmacro %}
+{% 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 %}

integration_tests/macros/tests.sql

@@ -1,12 +1,11 @@
-
 {% test assert_equal(model, actual, expected) %}
-select * from {{ model }} where {{ actual }} != {{ expected }}
+    select * from {{ model }} where {{ actual }} != {{ expected }}
 
 {% endtest %}
 
 
 {% test not_empty_string(model, column_name) %}
 
-select * from {{ model }} where {{ column_name }} = ''
+    select * from {{ model }} where {{ column_name }} = ''
 
 {% endtest %}

integration_tests/models/cross_db_utils/test_any_value.sql

@@ -1,19 +1,26 @@
-with some_model as (
-    select 1 as id, 'abc' as key_name, 'dbt' as static_col union all 
-    select 2 as id, 'abc' as key_name, 'dbt' as static_col union all
-    select 3 as id, 'jkl' as key_name, 'dbt' as static_col union all
-    select 4 as id, 'jkl' as key_name, 'dbt' as static_col union all
-    select 5 as id, 'jkl' as key_name, 'dbt' as static_col union all
-    select 6 as id, 'xyz' as key_name, 'test' as static_col
-),
+with
+    some_model as (
+        select 1 as id, 'abc' as key_name, 'dbt' as static_col
+        union all
+        select 2 as id, 'abc' as key_name, 'dbt' as static_col
+        union all
+        select 3 as id, 'jkl' as key_name, 'dbt' as static_col
+        union all
+        select 4 as id, 'jkl' as key_name, 'dbt' as static_col
+        union all
+        select 5 as id, 'jkl' as key_name, 'dbt' as static_col
+        union all
+        select 6 as id, 'xyz' as key_name, 'test' as static_col
+    ),
 
-final as (
-    select 
-        key_name, 
-        {{ dbt_utils.any_value('static_col') }} as static_col, 
-        count(id) as num_rows
-    from some_model
-    group by key_name
-)
+    final as (
+        select
+            key_name,
+            {{ dbt_utils.any_value("static_col") }} as static_col,
+            count(id) as num_rows
+        from some_model
+        group by key_name
+    )
 
-select * from final
+select *
+from final

integration_tests/models/cross_db_utils/test_bool_or.sql

@@ -1,5 +1,3 @@
-select 
-    key, 
-    {{ dbt_utils.bool_or('val1 = val2') }} as value
-from {{ ref('data_bool_or' )}}
-group by key
+select key, {{ dbt_utils.bool_or("val1 = val2") }} as value
+from {{ ref("data_bool_or") }}
+group by key

integration_tests/models/cross_db_utils/test_concat.sql

@@ -1,12 +1,5 @@
+with data as (select * from {{ ref("data_concat") }})
 
-with data as (
-
-    select * from {{ ref('data_concat') }}
-
-)
-
-select
-    {{ dbt_utils.concat(['input_1', 'input_2']) }} as actual,
-    output as expected
+select {{ dbt_utils.concat(["input_1", "input_2"]) }} as actual, output as expected
 
 from data

integration_tests/models/cross_db_utils/test_current_timestamp.sql

@@ -1,6 +1,4 @@
-
 -- how can we test this better?
 select
     {{ dbt_utils.current_timestamp() }} as actual,
     {{ dbt_utils.current_timestamp() }} as expected
-

integration_tests/models/cross_db_utils/test_current_timestamp_in_utc.sql

@@ -1,5 +1,4 @@
-
 -- how can we test this better?
 select
     {{ dbt_utils.current_timestamp_in_utc() }} as actual,
-    {{ dbt_utils.current_timestamp_in_utc() }} as expected
+    {{ dbt_utils.current_timestamp_in_utc() }} as expected

integration_tests/models/cross_db_utils/test_date_trunc.sql

@@ -1,20 +1,15 @@
-
-with data as (
-
-    select * from {{ ref('data_date_trunc') }}
-
-)
+with data as (select * from {{ ref("data_date_trunc") }})
 
 select
-    cast({{dbt_utils.date_trunc('day', 'updated_at') }} as date) as actual,
+    cast({{ dbt_utils.date_trunc("day", "updated_at") }} as date) as actual,
     day as expected
 
 from data
 
 union all
 
 select
-    cast({{ dbt_utils.date_trunc('month', 'updated_at') }} as date) as actual,
+    cast({{ dbt_utils.date_trunc("month", "updated_at") }} as date) as actual,
     month as expected
 
 from data

integration_tests/models/cross_db_utils/test_dateadd.sql

@@ -1,16 +1,31 @@
-
-with data as (
-
-    select * from {{ ref('data_dateadd') }}
-
-)
+with data as (select * from {{ ref("data_dateadd") }})
 
 select
     case
-        when datepart = 'hour' then cast({{ dbt_utils.dateadd('hour', 'interval_length', 'from_time') }} as {{dbt_utils.type_timestamp()}})
-        when datepart = 'day' then cast({{ dbt_utils.dateadd('day', 'interval_length', 'from_time') }} as {{dbt_utils.type_timestamp()}})
-        when datepart = 'month' then cast({{ dbt_utils.dateadd('month', 'interval_length', 'from_time') }} as {{dbt_utils.type_timestamp()}})
-        when datepart = 'year' then cast({{ dbt_utils.dateadd('year', 'interval_length', 'from_time') }} as {{dbt_utils.type_timestamp()}})
+        when datepart = 'hour'
+        then
+            cast(
+                {{ dbt_utils.dateadd("hour", "interval_length", "from_time") }}
+                as {{ dbt_utils.type_timestamp() }}
+            )
+        when datepart = 'day'
+        then
+            cast(
+                {{ dbt_utils.dateadd("day", "interval_length", "from_time") }}
+                as {{ dbt_utils.type_timestamp() }}
+            )
+        when datepart = 'month'
+        then
+            cast(
+                {{ dbt_utils.dateadd("month", "interval_length", "from_time") }}
+                as {{ dbt_utils.type_timestamp() }}
+            )
+        when datepart = 'year'
+        then
+            cast(
+                {{ dbt_utils.dateadd("year", "interval_length", "from_time") }}
+                as {{ dbt_utils.type_timestamp() }}
+            )
         else null
     end as actual,
     result as expected

integration_tests/models/cross_db_utils/test_datediff.sql

@@ -1,35 +1,100 @@
-
-with data as (
-
-    select * from {{ ref('data_datediff') }}
-
-)
+with data as (select * from {{ ref("data_datediff") }})
 
 select
 
     case
-        when datepart = 'second' then {{ dbt_utils.datediff('first_date', 'second_date', 'second') }}
-        when datepart = 'minute' then {{ dbt_utils.datediff('first_date', 'second_date', 'minute') }}
-        when datepart = 'hour' then {{ dbt_utils.datediff('first_date', 'second_date', 'hour') }}
-        when datepart = 'day' then {{ dbt_utils.datediff('first_date', 'second_date', 'day') }}
-        when datepart = 'week' then {{ dbt_utils.datediff('first_date', 'second_date', 'week') }}
-        when datepart = 'month' then {{ dbt_utils.datediff('first_date', 'second_date', 'month') }}
-        when datepart = 'year' then {{ dbt_utils.datediff('first_date', 'second_date', 'year') }}
+        when datepart = 'second'
+        then {{ dbt_utils.datediff("first_date", "second_date", "second") }}
+        when datepart = 'minute'
+        then {{ dbt_utils.datediff("first_date", "second_date", "minute") }}
+        when datepart = 'hour'
+        then {{ dbt_utils.datediff("first_date", "second_date", "hour") }}
+        when datepart = 'day'
+        then {{ dbt_utils.datediff("first_date", "second_date", "day") }}
+        when datepart = 'week'
+        then {{ dbt_utils.datediff("first_date", "second_date", "week") }}
+        when datepart = 'month'
+        then {{ dbt_utils.datediff("first_date", "second_date", "month") }}
+        when datepart = 'year'
+        then {{ dbt_utils.datediff("first_date", "second_date", "year") }}
         else null
     end as actual,
     result as expected
 
 from data
 
 -- Also test correct casting of literal values.
-
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "microsecond") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "millisecond") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "second") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "minute") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "hour") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "day") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-03 00:00:00.000000'", "week") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "month") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "quarter") }} as actual, 1 as expected
-union all select {{ dbt_utils.datediff("'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "year") }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'",
+            "'2000-01-01 00:00:00.000000'",
+            "microsecond",
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'",
+            "'2000-01-01 00:00:00.000000'",
+            "millisecond",
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "second"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "minute"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "hour"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "day"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-03 00:00:00.000000'", "week"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "month"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "quarter"
+        )
+    }} as actual, 1 as expected
+union all
+select
+    {{
+        dbt_utils.datediff(
+            "'1999-12-31 23:59:59.999999'", "'2000-01-01 00:00:00.000000'", "year"
+        )
+    }} as actual, 1 as expected

integration_tests/models/cross_db_utils/test_hash.sql

@@ -1,12 +1,5 @@
+with data as (select * from {{ ref("data_hash") }})
 
-with data as (
-
-    select * from {{ ref('data_hash') }}
-
-)
-
-select
-    {{ dbt_utils.hash('input_1') }} as actual,
-    output as expected
+select {{ dbt_utils.hash("input_1") }} as actual, output as expected
 
 from data

integration_tests/models/cross_db_utils/test_last_day.sql

@@ -1,15 +1,13 @@
-
-with data as (
-
-    select * from {{ ref('data_last_day') }}
-
-)
+with data as (select * from {{ ref("data_last_day") }})
 
 select
     case
-        when date_part = 'month' then {{ dbt_utils.last_day('date_day', 'month') }}
-        when date_part = 'quarter' then {{ dbt_utils.last_day('date_day', 'quarter') }}
-        when date_part = 'year' then {{ dbt_utils.last_day('date_day', 'year') }}
+        when date_part = 'month'
+        then {{ dbt_utils.last_day("date_day", "month") }}
+        when date_part = 'quarter'
+        then {{ dbt_utils.last_day("date_day", "quarter") }}
+        when date_part = 'year'
+        then {{ dbt_utils.last_day("date_day", "year") }}
         else null
     end as actual,
     result as expected

integration_tests/models/cross_db_utils/test_length.sql

@@ -1,12 +1,5 @@
-with data as (
+with data as (select * from {{ ref("data_length") }})
 
-    select * from {{ ref('data_length') }}
+select {{ dbt_utils.length("expression") }} as actual, output as expected
 
-)
-
-select
-
-    {{ dbt_utils.length('expression') }} as actual,
-    output as expected
-
-from data
+from data