Skip to content

Commit aca4bbb

Browse files
committed
CR
1 parent 91b0dde commit aca4bbb

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

macros/edr/system/hooks/on_run_start.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66

77
{% do elementary.recommend_dbt_core_artifacts_upgrade() %}
88
{% do elementary.ensure_materialize_override() %}
9-
{% set runtime_config = elementary.get_elementary_runtime_config() %}
9+
{% set runtime_config = elementary.get_elementary_runtime_config(include_defaults=false) %}
1010
{% set elementary_database, elementary_schema = elementary.get_package_database_and_schema() %}
11+
{% set elementary_version = elementary.get_elementary_package_version() %}
1112
{% set runtime = {
1213
"config": runtime_config,
1314
"dbt_version": dbt_version,
15+
"elementary_version": elementary_version,
1416
"database": elementary_database,
1517
"schema": elementary_schema,
1618
} %}
17-
{% do log("Elementary runtime: " ~ tojson(runtime), info=True) %}
19+
{% do elementary.edr_log("Runtime data: " ~ tojson(runtime), info=True) %}
1820
{% do elementary.init_elementary_graph() %}
1921

2022
{% if elementary.is_test_command() %}

macros/edr/system/system_utils/get_config_var.sql

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
{% macro get_elementary_runtime_config() %}
1+
{% macro get_elementary_runtime_config(include_defaults=true) %}
22
{% set default_config = elementary.get_default_config() %}
3+
{% set unset = '<ELEMENTARY_UNSET_MAGIC_STRING>' %}
34
{% set runtime_config = {} %}
45
{% for var_name in default_config.keys() %}
5-
{% set var_value = var(var_name, default_config.get(var_name)) %}
6-
{% do runtime_config.update({var_name: var_value}) %}
6+
{% if include_defaults %}
7+
{% set var_value = var(var_name, default_config.get(var_name)) %}
8+
{% else %}
9+
{% set var_value = var(var_name, unset) %}
10+
{% endif %}
11+
{% if var_value != unset %}
12+
{% do runtime_config.update({var_name: var_value}) %}
13+
{% endif %}
714
{% endfor %}
815
{% do return(runtime_config) %}
916
{% endmacro %}

0 commit comments

Comments
 (0)