Completely rely on vendored version of the format_column macro

dbt-labs · Sep 25, 2023 · b2f463c · b2f463c
1 parent 5e08a1a
commit b2f463c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/macros/generate_model_yaml.sql b/macros/generate_model_yaml.sql
@@ -7,12 +7,7 @@
 
     {% do model_yaml.append('      - name: ' ~ column_name  | lower ) %}
     {% if include_data_types %}
-        {% set version = (dbt_version.split('.')[0] ~ '.' ~  dbt_version.split('.')[1]) | float %}
-        {% if version < 1.5 %}
-            {% set formatted = format_column(column) %}
-        {% else %}
-            {% set formatted = adapter.dispatch('format_column', 'dbt')(column) %}
-        {% endif %}
+        {% set formatted = format_column(column) %}
         {% do model_yaml.append('        data_type: ' ~ formatted['data_type'] | lower) %}
     {% endif %}
     {% do model_yaml.append('        description: "' ~ column_desc_dict.get(column.name | lower,'') ~ '"') %}

diff --git a/macros/generate_source.sql b/macros/generate_source.sql
@@ -62,12 +62,7 @@
         {% for column in columns %}
             {% do sources_yaml.append('          - name: ' ~ column.name | lower ) %}
             {% if include_data_types %}
-                {% set version = (dbt_version.split('.')[0] ~ '.' ~  dbt_version.split('.')[1]) | float %}
-                {% if version < 1.5 %}
-                    {% set formatted = format_column(column) %}
-                {% else %}
-                    {% set formatted = adapter.dispatch('format_column', 'dbt')(column) %}
-                {% endif %}
+                {% set formatted = format_column(column) %}
                 {% do sources_yaml.append('            data_type: ' ~ formatted['data_type'] | lower) %}
             {% endif %}
             {% if include_descriptions %}