Restore dbt. prefix for all migrated cross-db macros (#701)

* added prefix dbt. on cross db macros * Also prefix for new macro * Adding changelog change * Squashed commit of the following: commit 5eba82b Author: Deanna Minnick <[email protected]> Date: Wed Oct 12 10:30:42 2022 -0400 remove whitespace in seed file commit 7a2a5e3 Author: Deanna Minnick <[email protected]> Date: Wed Oct 12 10:22:07 2022 -0400 fix syntax errors Co-authored-by: Joel Labes <[email protected]>
dbt-labs · Oct 13, 2022 · df08128 · df08128
1 parent 38df969
commit df08128
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,18 +23,20 @@
 - Fully remove varargs usage in surrogate_key and safe_add ([#674](https://github.com/dbt-labs/dbt-utils/pull/674))
 
 ## Fixes
+- Explicitly stating the namespace for cross-db macros so that the dispatch logic works correctly by restoring the dbt. prefix for all migrated cross-db macros ([#701](https://github.com/dbt-labs/dbt-utils/pull/701))
 - Better handling of whitespaces in the star macro ([#651](https://github.com/dbt-labs/dbt-utils/pull/651))
 - Fix to correct behavior in `mutually_exclusive_ranges` test in certain situations when `zero_length_range_allowed: true` and multiple ranges in a partition have the same value for `lower_bound_column`. ([[#659](https://github.com/dbt-labs/dbt-utils/issues/659)], [#660](https://github.com/dbt-labs/dbt-utils/pull/660))
 - Fix to utilize dbt Core version of `escape_single_quotes` instead of version from dbt Utils ([[#689](https://github.com/dbt-labs/dbt-utils/issues/689)], [#692](https://github.com/dbt-labs/dbt-utils/pull/692))
 
 ## Contributors:
+- [@SimonQuvang](https://github.com/SimonQuvang) (#701)
 - [@christineberger](https://github.com/christineberger) (#624)
 - [@epapineau](https://github.com/epapineau) (#634)
 - [@courentin](https://github.com/courentin) (#651)
 - [@sfc-gh-ancoleman](https://github.com/sfc-gh-ancoleman) (#660)
 - [@zachoj10](https://github.com/zachoj10) (#692)
 - [@miles170](https://github.com/miles170)
-- [@emilyriederer](https://github.com/emilyriederer) 
+- [@emilyriederer](https://github.com/emilyriederer)
 
 # dbt-utils v0.8.6
 

diff --git a/macros/generic_tests/cardinality_equality.sql b/macros/generic_tests/cardinality_equality.sql
@@ -26,15 +26,15 @@ group by {{ field }}
 except_a as (
   select *
   from table_a
-  {{ except() }}
+  {{ dbt.except() }}
   select *
   from table_b
 ),
 
 except_b as (
   select *
   from table_b
-  {{ except() }}
+  {{ dbt.except() }}
   select *
   from table_a
 ),

diff --git a/macros/generic_tests/equality.sql b/macros/generic_tests/equality.sql
@@ -49,15 +49,15 @@ b as (
 a_minus_b as (
 
     select {{compare_cols_csv}} from a
-    {{ except() }}
+    {{ dbt.except() }}
     select {{compare_cols_csv}} from b
 
 ),
 
 b_minus_a as (
 
     select {{compare_cols_csv}} from b
-    {{ except() }}
+    {{ dbt.except() }}
     select {{compare_cols_csv}} from a
 
 ),

diff --git a/macros/generic_tests/recency.sql b/macros/generic_tests/recency.sql
@@ -4,7 +4,8 @@
 
 {% macro default__test_recency(model, field, datepart, interval, group_by_columns) %}
 
-{% set threshold = dateadd(datepart, interval * -1, current_timestamp_backcompat()) %}
+{% set threshold = dbt.dateadd(datepart, interval * -1, current_timestamp_backcompat()) %}
+
 {% if group_by_columns|length() > 0 %}
   {% set select_gb_cols = group_by_columns|join(' ,') + ', ' %}
   {% set groupby_gb_cols = 'group by ' + group_by_columns|join(',') %}

diff --git a/macros/generic_tests/sequential_values.sql b/macros/generic_tests/sequential_values.sql
@@ -30,7 +30,7 @@ validation_errors as (
         *
     from windowed
     {% if datepart %}
-    where not(cast({{ column_name }} as {{ type_timestamp() }})= cast({{ dateadd(datepart, interval, previous_column_name) }} as {{ type_timestamp() }}))
+    where not(cast({{ column_name }} as {{ dbt.type_timestamp() }})= cast({{ dbt.dateadd(datepart, interval, previous_column_name) }} as {{ dbt.type_timestamp() }}))
     {% else %}
     where not({{ column_name }} = {{ previous_column_name }} + {{ interval }})
     {% endif %}

diff --git a/macros/sql/date_spine.sql b/macros/sql/date_spine.sql
@@ -5,7 +5,7 @@
 {% macro default__get_intervals_between(start_date, end_date, datepart) -%}
     {%- call statement('get_intervals_between', fetch_result=True) %}
 
-        select {{ datediff(start_date, end_date, datepart) }}
+        select {{ dbt.datediff(start_date, end_date, datepart) }}
 
     {%- endcall -%}
 
@@ -35,7 +35,7 @@
 date_spine(
     "day",
     "to_date('01/01/2016', 'mm/dd/yyyy')",
-    "dateadd(week, 1, current_date)"
+    "dbt.dateadd(week, 1, current_date)"
 ) #}
 
 
@@ -51,7 +51,7 @@ all_periods as (
 
     select (
         {{
-            dateadd(
+            dbt.dateadd(
                 datepart,
                 "row_number() over (order by 1) - 1",
                 start_date

diff --git a/macros/sql/generate_surrogate_key.sql b/macros/sql/generate_surrogate_key.sql
@@ -15,7 +15,7 @@
 {%- for field in field_list -%}
 
     {%- do fields.append(
-        "coalesce(cast(" ~ field ~ " as " ~ type_string() ~ "), '" ~ default_null_value  ~"')"
+        "coalesce(cast(" ~ field ~ " as " ~ dbt.type_string() ~ "), '" ~ default_null_value  ~"')"
     ) -%}
 
     {%- if not loop.last %}
@@ -24,6 +24,6 @@
 
 {%- endfor -%}
 
-{{ hash(concat(fields)) }}
+{{ dbt.hash(dbt.concat(fields)) }}
 
 {%- endmacro -%}
diff --git a/macros/sql/pivot.sql b/macros/sql/pivot.sql
@@ -69,7 +69,7 @@ Arguments:
     {{ agg }}(
       {% if distinct %} distinct {% endif %}
       case
-      when {{ column }} {{ cmp }} '{{ escape_single_quotes(value) }}'
+      when {{ column }} {{ cmp }} '{{ dbt.escape_single_quotes(value) }}'
         then {{ then_value }}
       else {{ else_value }}
       end

diff --git a/macros/sql/union.sql b/macros/sql/union.sql
@@ -100,7 +100,7 @@
             select
 
                 {%- if source_column_name is not none %}
-                cast({{ string_literal(relation) }} as {{ type_string() }}) as {{ source_column_name }},
+                cast({{ dbt.string_literal(relation) }} as {{ dbt.type_string() }}) as {{ source_column_name }},
                 {%- endif %}
 
                 {% for col_name in ordered_column_names -%}

diff --git a/macros/sql/unpivot.sql b/macros/sql/unpivot.sql
@@ -48,9 +48,9 @@ Arguments:
         {{ exclude_col }},
       {%- endfor %}
 
-      cast('{{ col.column }}' as {{ type_string() }}) as {{ field_name }},
+      cast('{{ col.column }}' as {{ dbt.type_string() }}) as {{ field_name }},
       cast(  {% if col.data_type == 'boolean' %}
-           {{ cast_bool_to_text(col.column) }}
+           {{ dbt.cast_bool_to_text(col.column) }}
              {% else %}
            {{ col.column }}
              {% endif %}

diff --git a/macros/sql/width_bucket.sql b/macros/sql/width_bucket.sql
@@ -13,8 +13,8 @@
         case
             when
                 mod(
-                    {{ dbt.safe_cast(expr, type_numeric() ) }},
-                    {{ dbt.safe_cast(bin_size, type_numeric() ) }}
+                    {{ dbt.safe_cast(expr, dbt.type_numeric() ) }},
+                    {{ dbt.safe_cast(bin_size, dbt.type_numeric() ) }}
                 ) = 0
             then 1
             else 0
@@ -38,8 +38,8 @@
         -- to break ties when the amount is exactly at the bucket edge
         case
             when
-                {{ dbt.safe_cast(expr, type_numeric() ) }} %
-                {{ dbt.safe_cast(bin_size, type_numeric() ) }}
+                {{ dbt.safe_cast(expr, dbt.type_numeric() ) }} %
+                {{ dbt.safe_cast(bin_size, dbt.type_numeric() ) }}
                  = 0
             then 1
             else 0

diff --git a/macros/web/get_url_host.sql b/macros/web/get_url_host.sql
@@ -5,11 +5,11 @@
 {% macro default__get_url_host(field) -%}
 
 {%- set parsed =
-    split_part(
-        split_part(
-            replace(
-                replace(
-                    replace(field, "'android-app://'", "''"
+    dbt.split_part(
+        dbt.split_part(
+            dbt.replace(
+                dbt.replace(
+                    dbt.replace(field, "'android-app://'", "''"
                     ), "'http://'", "''"
                 ), "'https://'", "''"
             ), "'/'", 1
@@ -21,7 +21,7 @@
 
     {{ dbt.safe_cast(
         parsed,
-        type_string()
+        dbt.type_string()
         )}}
 
 {%- endmacro %}
diff --git a/macros/web/get_url_parameter.sql b/macros/web/get_url_parameter.sql
@@ -6,7 +6,7 @@
 
 {%- set formatted_url_parameter = "'" + url_parameter + "='" -%}
 
-{%- set split = split_part(split_part(field, formatted_url_parameter, 2), "'&'", 1) -%}
+{%- set split = dbt.split_part(dbt.split_part(field, formatted_url_parameter, 2), "'&'", 1) -%}
 
 nullif({{ split }},'')
 

diff --git a/macros/web/get_url_path.sql b/macros/web/get_url_path.sql
@@ -5,30 +5,30 @@
 {% macro default__get_url_path(field) -%}
 
     {%- set stripped_url =
-        replace(
-            replace(field, "'http://'", "''"), "'https://'", "''")
+        dbt.replace(
+            dbt.replace(field, "'http://'", "''"), "'https://'", "''")
     -%}
 
     {%- set first_slash_pos -%}
         coalesce(
-            nullif({{ position("'/'", stripped_url) }}, 0),
-            {{ position("'?'", stripped_url) }} - 1
+            nullif({{ dbt.position("'/'", stripped_url) }}, 0),
+            {{ dbt.position("'?'", stripped_url) }} - 1
             )
     {%- endset -%}
 
     {%- set parsed_path =
-        split_part(
-            right(
+        dbt.split_part(
+            dbt.right(
                 stripped_url,
-                length(stripped_url) ~ "-" ~ first_slash_pos
+                dbt.length(stripped_url) ~ "-" ~ first_slash_pos
                 ),
             "'?'", 1
             )
     -%}
 
-    {{ safe_cast(
+    {{ dbt.safe_cast(
         parsed_path,
-        type_string()
+        dbt.type_string()
     )}}
 
 {%- endmacro %}