From 6cecf1cca3cff69a8fb7728932282ebf6318d037 Mon Sep 17 00:00:00 2001 From: Jeremy Holtzman Date: Mon, 10 Apr 2023 13:22:08 -0400 Subject: [PATCH] add database and schema properties to generate_sources --- CHANGELOG.md | 1 + README.md | 1 + integration_tests/tests/test_generate_source.sql | 2 ++ integration_tests/tests/test_generate_source_all_args.sql | 2 ++ integration_tests/tests/test_generate_source_exclude.sql | 2 ++ integration_tests/tests/test_generate_source_some_tables.sql | 2 ++ .../tests/test_generate_source_table_descriptions.sql | 2 ++ integration_tests/tests/test_generate_source_table_name.sql | 1 + .../tests/test_generate_source_table_pattern.sql | 2 ++ macros/generate_source.sql | 4 ---- 10 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e37590..8d46a02 100644 --- 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. +- Always include database and schema properties in `sources.yml` generated from `generate_source` ([#123](https://github.com/dbt-labs/dbt-codegen/issues/123)) ## 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)) diff --git a/README.md b/README.md index 472ae8a..996ffcc 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ version: 2 sources: - name: raw_jaffle_shop database: raw + schema: raw_jaffle_shop tables: - name: customers description: "" diff --git a/integration_tests/tests/test_generate_source.sql b/integration_tests/tests/test_generate_source.sql index ce48bd6..324b6c0 100644 --- a/integration_tests/tests/test_generate_source.sql +++ b/integration_tests/tests/test_generate_source.sql @@ -9,6 +9,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower }} + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__a_relation - name: data__b_relation diff --git a/integration_tests/tests/test_generate_source_all_args.sql b/integration_tests/tests/test_generate_source_all_args.sql index fb46970..8a5b983 100644 --- a/integration_tests/tests/test_generate_source_all_args.sql +++ b/integration_tests/tests/test_generate_source_all_args.sql @@ -20,6 +20,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower }} description: "" + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__a_relation description: "" diff --git a/integration_tests/tests/test_generate_source_exclude.sql b/integration_tests/tests/test_generate_source_exclude.sql index e1bd85d..e86a468 100644 --- a/integration_tests/tests/test_generate_source_exclude.sql +++ b/integration_tests/tests/test_generate_source_exclude.sql @@ -9,6 +9,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower}} + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__b_relation - name: data__campaign_analytics diff --git a/integration_tests/tests/test_generate_source_some_tables.sql b/integration_tests/tests/test_generate_source_some_tables.sql index 525f712..a29cb53 100644 --- a/integration_tests/tests/test_generate_source_some_tables.sql +++ b/integration_tests/tests/test_generate_source_some_tables.sql @@ -16,6 +16,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower }} description: "" + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__a_relation description: "" diff --git a/integration_tests/tests/test_generate_source_table_descriptions.sql b/integration_tests/tests/test_generate_source_table_descriptions.sql index 772c637..ca917e4 100644 --- a/integration_tests/tests/test_generate_source_table_descriptions.sql +++ b/integration_tests/tests/test_generate_source_table_descriptions.sql @@ -10,6 +10,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower }} description: "" + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__a_relation description: "" diff --git a/integration_tests/tests/test_generate_source_table_name.sql b/integration_tests/tests/test_generate_source_table_name.sql index a636ac0..dce934d 100644 --- a/integration_tests/tests/test_generate_source_table_name.sql +++ b/integration_tests/tests/test_generate_source_table_name.sql @@ -9,6 +9,7 @@ version: 2 sources: - name: raw + database: analytics schema: {{ raw_schema | trim | lower }} tables: - name: data__a_relation diff --git a/integration_tests/tests/test_generate_source_table_pattern.sql b/integration_tests/tests/test_generate_source_table_pattern.sql index 7818ed9..85eaa7d 100644 --- a/integration_tests/tests/test_generate_source_table_pattern.sql +++ b/integration_tests/tests/test_generate_source_table_pattern.sql @@ -9,6 +9,8 @@ version: 2 sources: - name: {{ raw_schema | trim | lower }} + database: analytics + schema: codegen_integration_tests_snowflake_raw_data tables: - name: data__b_relation {% endset %} diff --git a/macros/generate_source.sql b/macros/generate_source.sql index df81053..948e36a 100644 --- a/macros/generate_source.sql +++ b/macros/generate_source.sql @@ -27,13 +27,9 @@ {% do sources_yaml.append(' description: ""' ) %} {% endif %} -{% if database_name != target.database %} {% do sources_yaml.append(' database: ' ~ database_name | lower) %} -{% endif %} -{% if schema_name != name %} {% do sources_yaml.append(' schema: ' ~ schema_name | lower) %} -{% endif %} {% do sources_yaml.append(' tables:') %}