dbt-labs · dbeatty10 · Sep 25, 2023 · Apr 7, 2023 · Apr 7, 2023 · Apr 8, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 This macro generates a series of terminal commands (appended w) bash script which creates a new file in your dbt project based off the results of the [generate_base_model](macros/generate_base_model.sql) macro. Therefore, instead of outputting in the terminal, it will create the file for you.
 - Add `include_data_types` flag to `generate_source` macro ([#76](https://github.com/dbt-labs/dbt-codegen/pull/76))
 - Add `get_models` macro in helper macros. This macro retrieves a list of models with specified prefix at the specified directory. It is designed to make creating yamls for multiple models easier.
+- Add `include_data_types` flag to `generate_model_yaml` macro ([#122](https://github.com/dbt-labs/dbt-codegen/pull/122))
 
 ## Fixes
 - Fix handling of nested `STRUCT` fields in BigQuery ([#98](https://github.com/dbt-labs/dbt-codegen/issues/98), [#105](https://github.com/dbt-labs/dbt-codegen/pull/105))
@@ -27,6 +28,7 @@ This macro generates a series of terminal commands (appended w) bash script whic
 ## Contributors:
 - [@fivetran-joemarkiewicz](https://github.com/fivetran-joemarkiewicz) (#83)
 - [@GSokol](https://github.com/GSokol) (#76)
+- [@linbug](https://github.com/linbug) (#120)
 
 # dbt-codegen v0.9.0
 

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ source data is in.
 column names to your source definition.
 * `include_descriptions` (optional, default=False): Whether you want to add 
 description placeholders to your source definition.
-* `include_data_types` (optional, default=False): Whether you want to add data
+* `include_data_types` (optional, default=True): Whether you want to add data
 types to your source columns definitions.
 * `table_pattern` (optional, default='%'): A table prefix / postfix that you
 want to subselect from all available tables within a given schema.
@@ -77,10 +77,10 @@ or
 $ dbt run-operation generate_source --args '{"schema_name": "jaffle_shop", "database_name": "raw", "table_names":["table_1", "table_2"]}'
 ```
 
-Including data types:
+or if you want to include column names and data types:
 
 ```
-$ dbt run-operation generate_source --args '{"schema_name": "jaffle_shop", "generate_columns": "true", "include_data_types": "true"}'
+$ dbt run-operation generate_source --args '{"schema_name": "jaffle_shop", "generate_columns": "true"}'
 ```
 
 2. The YAML for the source will be logged to the command line
@@ -197,6 +197,7 @@ schema.yml file.
 ### Arguments:
 * `model_names` (required): The model(s) you wish to generate YAML for.
 * `upstream_descriptions` (optional, default=False): Whether you want to include descriptions for identical column names from upstream models.
+* `include_data_types` (optional, default=True): Whether you want to add data types to your model column definitions.
 
 ### Usage:
 1. Create a model.
@@ -230,10 +231,13 @@ version: 2
 
 models:
   - name: customers
+    description: ""
     columns:
       - name: customer_id
+        data_type: integer
         description: ""
       - name: customer_name
+        data_type: text
         description: ""
 ```
 

diff --git a/integration_tests/macros/integer_type_value.sql b/integration_tests/macros/integer_type_value.sql
@@ -1,9 +1,9 @@
 {%- macro integer_type_value() -%}
 {%- if target.type == "snowflake" -%}
-NUMBER(38,0)
+number(38,0)
 {%- elif target.type == "bigquery" -%}
-INT64
+int64
 {%- else -%}
-INTEGER
+integer
 {%- endif -%}
 {%- endmacro -%}
diff --git a/integration_tests/macros/text_type_value.sql b/integration_tests/macros/text_type_value.sql
@@ -1,11 +1,11 @@
 {%- macro text_type_value(text_length) -%}
 {%- if target.type == "redshift" -%}
-CHARACTER VARYING({{ text_length }})
+character varying({{ text_length }})
 {%- elif target.type == "snowflake" -%}
-CHARACTER VARYING(16777216)
+character varying(16777216)
 {%- elif target.type == "bigquery" -%}
-STRING
+string
 {%- else -%}
-TEXT
+text
 {%- endif -%}
 {%- endmacro -%}
diff --git a/integration_tests/tests/test_generate_model_struct_yaml.sql b/integration_tests/tests/test_generate_model_struct_yaml.sql
@@ -10,7 +10,8 @@
 ) %}
 
 {% set actual_source_yaml = codegen.generate_model_yaml(
-    model_names=['model_struct']
+    model_names=['model_struct'],
+    include_data_types=False
   )
 %}
 

diff --git a/integration_tests/tests/test_generate_model_yaml.sql b/integration_tests/tests/test_generate_model_yaml.sql
@@ -11,9 +11,11 @@ models:
     description: ""
     columns:
       - name: col_a
+        data_type: {{ integer_type_value() }}
         description: ""
 
       - name: col_b
+        data_type: {{ text_type_value(1) }}
         description: ""
 
 {% endset %}

diff --git a/integration_tests/tests/test_generate_model_yaml_multiple_models.sql b/integration_tests/tests/test_generate_model_yaml_multiple_models.sql
@@ -1,5 +1,6 @@
 {% set actual_model_yaml = codegen.generate_model_yaml(
-    model_names=['data__a_relation','data__b_relation']
+    model_names=['data__a_relation','data__b_relation'],
+    include_data_types=False
   )
 %}
 

diff --git a/integration_tests/tests/test_generate_model_yaml_upstream_descriptions.sql b/integration_tests/tests/test_generate_model_yaml_upstream_descriptions.sql
@@ -1,6 +1,7 @@
 {% set actual_model_yaml = codegen.generate_model_yaml(
     model_names=['child_model'],
-    upstream_descriptions=True
+    upstream_descriptions=True,
+    include_data_types=False
   )
 %}
 

diff --git a/integration_tests/tests/test_generate_source_some_tables.sql b/integration_tests/tests/test_generate_source_some_tables.sql
@@ -6,7 +6,8 @@
     database_name=target.database,
     table_names=['data__a_relation'],
     generate_columns=True,
-    include_descriptions=True
+    include_descriptions=True,
+    include_data_types=False
 ) %}
 
 

diff --git a/macros/generate_model_yaml.sql b/macros/generate_model_yaml.sql
@@ -1,23 +1,26 @@
-{% macro generate_column_yaml(column, model_yaml, column_desc_dict, parent_column_name="") %}
+{% macro generate_column_yaml(column, model_yaml, column_desc_dict, include_data_types, parent_column_name="") %}
     {% if parent_column_name %}
         {% set column_name = parent_column_name ~ "." ~ column.name %}
     {% else %}
         {% set column_name = column.name %}
     {% endif %}
 
     {% do model_yaml.append('      - name: ' ~ column_name  | lower ) %}
+    {% if include_data_types %}
+        {% do model_yaml.append('        data_type: ' ~ column.data_type | lower) %}
+    {% endif %}
     {% do model_yaml.append('        description: "' ~ column_desc_dict.get(column.name | lower,'') ~ '"') %}
     {% do model_yaml.append('') %}
 
     {% if column.fields|length > 0 %}
         {% for child_column in column.fields %}
-            {% set model_yaml = codegen.generate_column_yaml(child_column, model_yaml, column_desc_dict, parent_column_name=column_name) %}
+            {% set model_yaml = codegen.generate_column_yaml(child_column, model_yaml, column_desc_dict, include_data_types, parent_column_name=column_name) %}
         {% endfor %}
     {% endif %}
     {% do return(model_yaml) %}
 {% endmacro %}
 
-{% macro generate_model_yaml(model_names=[], upstream_descriptions=False) %}
+{% macro generate_model_yaml(model_names=[], upstream_descriptions=False, include_data_types=True) %}
 
     {% set model_yaml=[] %}
 
@@ -38,7 +41,7 @@
             {% set column_desc_dict =  codegen.build_dict_column_descriptions(model) if upstream_descriptions else {} %}
 
             {% for column in columns %}
-                {% set model_yaml = codegen.generate_column_yaml(column, model_yaml, column_desc_dict) %}
+                {% set model_yaml = codegen.generate_column_yaml(column, model_yaml, column_desc_dict, include_data_types) %}
             {% endfor %}
         {% endfor %}
     {% endif %}

diff --git a/macros/generate_source.sql b/macros/generate_source.sql
@@ -15,7 +15,7 @@
 
 
 ---
-{% macro generate_source(schema_name, database_name=target.database, generate_columns=False, include_descriptions=False, include_data_types=False, table_pattern='%', exclude='', name=schema_name, table_names=None) %}
+{% macro generate_source(schema_name, database_name=target.database, generate_columns=False, include_descriptions=False, include_data_types=True, table_pattern='%', exclude='', name=schema_name, table_names=None) %}
 
 {% set sources_yaml=[] %}
 {% do sources_yaml.append('version: 2') %}
@@ -62,7 +62,7 @@
         {% for column in columns %}
             {% do sources_yaml.append('          - name: ' ~ column.name | lower ) %}
             {% if include_data_types %}
-                {% do sources_yaml.append('            data_type: ' ~ (column.data_type | upper ) ) %}
+                {% do sources_yaml.append('            data_type: ' ~ (column.data_type | lower ) ) %}
             {% endif %}
             {% if include_descriptions %}
                 {% do sources_yaml.append('            description: ""' ) %}