Slightly better

dbt-labs · Jul 22, 2022 · 10a0140 · 10a0140
1 parent 331ab6c
commit 10a0140
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 23 deletions.
diff --git a/integration_tests/dbt_utils/dbt_project.yml b/integration_tests/dbt_utils/dbt_project.yml
@@ -17,6 +17,8 @@ clean-targets:         # directories to be removed by `dbt clean`
     - "dbt_modules"
 
 dispatch:
+  - macro_namespace: dbt
+    search_order: ['dbt']
   - macro_namespace: dbt_utils
     search_order:
       - spark_utils

diff --git a/macros/dbt_utils/cross_db_utils/concat.sql b/macros/dbt_utils/cross_db_utils/concat.sql
diff --git a/macros/dbt_utils/cross_db_utils/dateadd.sql b/macros/dbt_utils/cross_db_utils/dateadd.sql
diff --git a/macros/dbt_utils/cross_db_utils/datediff.sql b/macros/dbt_utils/cross_db_utils/datediff.sql
diff --git a/macros/dbt_utils/cross_db_utils/deprecated/assert_not_null.sql b/macros/dbt_utils/cross_db_utils/deprecated/assert_not_null.sql
@@ -0,0 +1,3 @@
+{% macro assert_not_null(function, arg) -%}
+  {{ return(adapter.dispatch('assert_not_null', 'dbt')(function, arg)) }}
+{%- endmacro %}
diff --git a/macros/dbt_utils/cross_db_utils/deprecated/concat.sql b/macros/dbt_utils/cross_db_utils/deprecated/concat.sql
@@ -0,0 +1,3 @@
+{% macro spark__concat(fields) -%}
+    {{ return(adapter.dispatch('concat', 'dbt')(fields)) }}
+{%- endmacro %}
diff --git a/...os/dbt_utils/cross_db_utils/datatypes.sql → ...s/cross_db_utils/deprecated/datatypes.sql b/...os/dbt_utils/cross_db_utils/datatypes.sql → ...s/cross_db_utils/deprecated/datatypes.sql
@@ -1,5 +1,5 @@
 {# numeric  ------------------------------------------------     #}
 
 {% macro spark__type_numeric() %}
-    {{ return(dbt.type_numeric()) }}
+    {{ return(adapter.dispatch('type_numeric', 'dbt')()) }}
 {% endmacro %}
diff --git a/macros/dbt_utils/cross_db_utils/deprecated/dateadd.sql b/macros/dbt_utils/cross_db_utils/deprecated/dateadd.sql
@@ -0,0 +1,6 @@
+{% macro spark__dateadd(datepart, interval, from_date_or_timestamp) %}
+    -- dispatch here gets very very confusing
+    -- we just need to hint to dbt that this is a required macro for resolving dbt.spark__datediff()
+    -- {{ assert_not_null() }}
+    {{ return(adapter.dispatch('dateadd', 'dbt')(datepart, interval, from_date_or_timestamp)) }}
+{% endmacro %}
diff --git a/macros/dbt_utils/cross_db_utils/deprecated/datediff.sql b/macros/dbt_utils/cross_db_utils/deprecated/datediff.sql
@@ -0,0 +1,6 @@
+{% macro spark__datediff(first_date, second_date, datepart) %}
+    -- dispatch here gets very very confusing
+    -- we just need to hint to dbt that this is a required macro for resolving dbt.spark__datediff()
+    -- {{ assert_not_null() }}
+    {{ return(adapter.dispatch('datediff', 'dbt')(first_date, second_date, datepart)) }}
+{% endmacro %}
diff --git a/macros/dbt_utils/cross_db_utils/deprecated/split_part.sql b/macros/dbt_utils/cross_db_utils/deprecated/split_part.sql
@@ -0,0 +1,3 @@
+{% macro spark__split_part(string_text, delimiter_text, part_number) %}
+  {{ return(adapter.dispatch('split_part', 'dbt')(string_text, delimiter_text, part_number)) }}
+{% endmacro %}
diff --git a/macros/dbt_utils/cross_db_utils/split_part.sql b/macros/dbt_utils/cross_db_utils/split_part.sql
diff --git a/macros/etc/assert_not_null.sql b/macros/etc/assert_not_null.sql
diff --git a/tests/functional/test_utils.py b/tests/functional/test_utils.py
@@ -19,7 +19,7 @@ def packages(self):
         return {
             "packages": [
                 {"local": os.getcwd()},
-                {"local": f"{os.getcwd()}/dbt-utils"}
+                {"git": "https://github.com/dbt-labs/dbt-utils"}
             ]}
 
     @pytest.fixture(scope="class")