diff --git a/macros/generate_model_yaml.sql b/macros/generate_model_yaml.sql index 0c98342..a994f27 100644 --- 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 index 6344719..ab41f6f 100644 --- 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 %}