Skip to content

Commit

Permalink
Merge pull request #427 from dbt-labs/add-version-to-output
Browse files Browse the repository at this point in the history
Add version to output
dave-connors-3 authored Apr 5, 2024
2 parents 33fb3a7 + ff36cf1 commit f390535
Showing 16 changed files with 34 additions and 8 deletions.
9 changes: 9 additions & 0 deletions integration_tests/models/marts/_int_model_5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
models:
- name: int_model_5
latest_version: 2
versions:
- v: 1
deprecation_date: 2024-01-01
- v: 2
deprecation_date: 2029-01-01
- v: 3
1 change: 1 addition & 0 deletions integration_tests/models/marts/int_model_5_v1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
select 1 as id
1 change: 1 addition & 0 deletions integration_tests/models/marts/int_model_5_v3.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
select 1 as id
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
parent,child,parent_and_child,is_loop_independent
stg_model_1,int_model_5,int_model_4,true
stg_model_1,int_model_5.v2,int_model_4,true
2 changes: 2 additions & 0 deletions integration_tests/seeds/dag/test_fct_root_models.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
child
int_model_5.v1
int_model_5.v3
model_8
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
total_models,documented_models,documentation_coverage_pct,staging_documentation_coverage_pct,intermediate_documentation_coverage_pct,marts_documentation_coverage_pct,other_documentation_coverage_pct
16,4,25,20.00,0.00,0.00,75.00
18,4,22.22,20.00,0.00,0.00,75.00
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ model_8,marts
fct_model_9,marts
dim_model_7,marts
int_model_4,intermediate
int_model_5,intermediate
int_model_5.v1,intermediate
int_model_5.v2,intermediate
int_model_5.v3,intermediate
report_3,other
fct_model_10,marts
Original file line number Diff line number Diff line change
@@ -4,4 +4,6 @@ stg_model_4,models/staging/stg_model_4.sql,models/staging/source_1/stg_model_4.s
stg_model_3,models/staging/source_1/stg_model_3.sql,models/staging/source_2/stg_model_3.sql
dim_model_7,models/marts/intermediate/dim_model_7.sql,models/.../marts/.../dim_model_7.sql
int_model_4,models/marts/int_model_4.sql,models/.../intermediate/.../int_model_4.sql
int_model_5,models/marts/int_model_5.sql,models/.../intermediate/.../int_model_5.sql
int_model_5.v1,models/marts/int_model_5_v1.sql,models/.../intermediate/.../int_model_5_v1.sql
int_model_5.v2,models/marts/int_model_5_v2.sql,models/.../intermediate/.../int_model_5_v2.sql
int_model_5.v3,models/marts/int_model_5_v3.sql,models/.../intermediate/.../int_model_5_v3.sql
Original file line number Diff line number Diff line change
@@ -3,7 +3,9 @@ dim_model_7,FALSE,0
fct_model_6,FALSE,0
model_8,FALSE,0
fct_model_9,FALSE,0
int_model_5,FALSE,0
int_model_5.v1,FALSE,0
int_model_5.v2,FALSE,0
int_model_5.v3,FALSE,0
report_1,FALSE,0
report_2,FALSE,0
report_3,FALSE,0
2 changes: 1 addition & 1 deletion integration_tests/seeds/tests/test_fct_test_coverage.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
total_models,total_tests,tested_models,test_coverage_pct,staging_test_coverage_pct,intermediate_test_coverage_pct,marts_test_coverage_pct,other_test_coverage_pct,test_to_model_ratio
16,13,6,37.50,80.00,50.00,0.00,25.00,0.8125
18,13,6,33.33,80.00,25.00,0.00,25.00,0.7222
2 changes: 1 addition & 1 deletion integration_tests/seeds/tests/tests_seeds.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ seeds:
- total_models
- total_tests
- tested_models
- test_coverage_pct
- "{{ 'test_coverage_pct' if not target.name in ['duckdb', 'databricks', 'trino'] else 'tested_models' }}"
- test_to_model_ratio
- staging_test_coverage_pct
- intermediate_test_coverage_pct
2 changes: 2 additions & 0 deletions macros/unpack/get_node_values.sql
Original file line number Diff line number Diff line change
@@ -27,6 +27,8 @@
wrap_string_with_quotes(node.group),
wrap_string_with_quotes(node.access),
wrap_string_with_quotes(node.latest_version),
wrap_string_with_quotes(node.version),
wrap_string_with_quotes(node.deprecation_date),
"cast(" ~ contract | trim ~ " as boolean)",
node.columns.values() | list | length,
node.columns.values() | list | selectattr('description') | list | length,
3 changes: 3 additions & 0 deletions models/marts/core/int_all_graph_resources.sql
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ unioned_with_calc as (
*,
case
when resource_type = 'source' then {{ dbt.concat(['source_name',"'.'",'name']) }}
when version is not null then {{ dbt.concat(['name',"'.v'",'version']) }}
else name
end as resource_name,
case
@@ -83,6 +84,8 @@ joined as (
unioned_with_calc.access,
unioned_with_calc.access = 'public' as is_public,
unioned_with_calc.latest_version,
unioned_with_calc.version,
unioned_with_calc.deprecation_date,
unioned_with_calc.is_contract_enforced,
unioned_with_calc.total_defined_columns,
unioned_with_calc.total_described_columns,
2 changes: 1 addition & 1 deletion models/marts/tests/intermediate/int_model_test_summary.sql
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ agg_test_relationships as (

final as (
select
all_graph_resources.resource_name,
all_graph_resources.resource_name,
all_graph_resources.resource_type,
all_graph_resources.model_type,
coalesce(agg_test_relationships.is_primary_key_tested, FALSE) as is_primary_key_tested,
2 changes: 2 additions & 0 deletions models/staging/graph/stg_nodes.sql
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ select
cast(null as {{ dbt.type_string() }}) as model_group,
cast(null as {{ dbt.type_string() }}) as access,
cast(null as {{ dbt.type_string() }}) as latest_version,
cast(null as {{ dbt.type_string() }}) as version,
cast(null as {{ dbt.type_string() }}) as deprecation_date,
cast(True as boolean) as is_contract_enforced,
cast(0 as {{ dbt.type_int() }}) as total_defined_columns,
cast(0 as {{ dbt.type_int() }}) as total_described_columns,

0 comments on commit f390535

Please sign in to comment.