Merge pull request #475 from mweso-softserve/type_string_macro_handling_all_cases

Author: b-per

README.md

@@ -29,7 +29,7 @@ Currently, the following adapters are supported:
 
 Check [dbt Hub](https://hub.getdbt.com/dbt-labs/dbt_project_evaluator/latest/) for the latest installation instructions, or [read the docs](https://docs.getdbt.com/docs/package-management) for more information on installing packages.
 
-### Additional setup for Databricks/Spark/DuckDB/Redshift
+### Additional setup for Databricks/Spark/DuckDB
 
 In your `dbt_project.yml`, add the following config:
 

macros/cross_db_shim/redshift_shims.sql

@@ -0,0 +1,11 @@
+{%- macro type_string_dpe() -%}
+    {{ return(adapter.dispatch('type_string_dpe', 'dbt_project_evaluator')()) }}
+{%- endmacro -%}
+
+{%- macro default__type_string_dpe() -%}
+    {{ return(dbt.type_string()) }}
+{%- endmacro -%}
+
+{%- macro redshift__type_string_dpe() -%}
+    {{ return(api.Column.string_type(600)) }}
+{%- endmacro -%}

macros/unpack/type_large_string.sql …cros/cross_db_shim/type_large_string.sqlmacros/unpack/type_large_string.sql renamed to macros/cross_db_shim/type_large_string.sql macros/unpack/type_large_string.sql renamed to macros/cross_db_shim/type_large_string.sql

@@ -23,8 +23,8 @@
 
                 {%- set values_line = 
                   [
-                    "cast('" ~ node.unique_id ~ "' as " ~ dbt.type_string() ~ ")",
-                    "cast(NULL as " ~ dbt.type_string() ~ ")",
+                    "cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
+                    "cast(NULL as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
                     "FALSE",
                   ] 
                 %}
@@ -37,8 +37,8 @@
 
                     {%- set values_line = 
                         [
-                            "cast('" ~ node.unique_id ~ "' as " ~ dbt.type_string() ~ ")",
-                            "cast('" ~ parent ~ "' as " ~ dbt.type_string() ~ ")",
+                            "cast('" ~ node.unique_id ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
+                            "cast('" ~ parent ~ "' as " ~ dbt_project_evaluator.type_string_dpe() ~ ")",
                             "" ~ loop.last ~ "" if node.unique_id.split('.')[0] == 'test' else "FALSE"
                         ]
                     %}

macros/cross_db_shim/type_string.sql

@@ -1,6 +1,6 @@
 {% macro wrap_string_with_quotes(str) %}
   {% if str is none %}
-    {{ return('cast(NULL as ' ~ dbt.type_string() ~ ')') }}
+    {{ return('cast(NULL as ' ~ dbt_project_evaluator.type_string_dpe() ~ ')') }}
   {% else %}
     {{ dbt.string_literal(str) }}
   {% endif %}

macros/unpack/get_relationship_values.sql

@@ -15,8 +15,8 @@ with dummy_cte as (
 ) 
 
 select 
-    cast(null as {{ dbt.type_string()}}) as resource_id,
-    cast(null as {{ dbt.type_string()}}) as direct_parent_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
     cast(True as boolean) as is_primary_relationship
 
 from dummy_cte

macros/wrap_string_with_quotes.sql

@@ -15,8 +15,8 @@ with dummy_cte as (
 ) 
 
 select 
-    cast(null as {{ dbt.type_string()}}) as resource_id,
-    cast(null as {{ dbt.type_string()}}) as direct_parent_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
     cast(True as boolean) as is_primary_relationship
 
 from dummy_cte

models/staging/graph/base/base_exposure_relationships.sql

@@ -14,14 +14,14 @@ with dummy_cte as (
 ) 
 
 select 
-    cast(null as {{ dbt.type_string() }}) as node_unique_id,
-    cast(null as {{ dbt.type_string()}}) as name,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe() }}) as node_unique_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as name,
     cast(null as {{ dbt_project_evaluator.type_large_string()}}) as description,
-    cast(null as {{ dbt.type_string()}}) as data_type,
-    cast(null as {{ dbt.type_string()}}) as constraints,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as data_type,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as constraints,
     cast(True as boolean) as has_not_null_constraint,
     cast(0 as {{ dbt.type_int() }}) as constraints_count,
-    cast(null as {{ dbt.type_string()}}) as quote
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as quote
 
 from dummy_cte
 where false

models/staging/graph/base/base_metric_relationships.sql

@@ -14,8 +14,8 @@ with dummy_cte as (
 ) 
 
 select 
-    cast(null as {{ dbt.type_string()}}) as resource_id,
-    cast(null as {{ dbt.type_string()}}) as direct_parent_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as resource_id,
+    cast(null as {{ dbt_project_evaluator.type_string_dpe()}}) as direct_parent_id,
     cast(True as boolean) as is_primary_relationship
 
 from dummy_cte