Skip to content

Commit 704b775

Browse files
committed
Add new macros for Fusion compatibility
1 parent d4e8c63 commit 704b775

File tree

15 files changed

+44
-21
lines changed

15 files changed

+44
-21
lines changed

macros/materialisations/period_mat_helpers/get_start_stop_dates.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
{% macro get_start_stop_dates(timestamp_field, date_source_models) %}
77

8-
{% if config.get('start_date', default=none) is not none %}
9-
{%- set start_date = config.get('start_date') -%}
10-
{%- set stop_date = config.get('stop_date', default=none) -%}
8+
{% if automate_dv.config_meta_get('start_date', default=none) is not none %}
9+
{%- set start_date = automate_dv.config_meta_get('start_date') -%}
10+
{%- set stop_date = automate_dv.config_meta_get('stop_date', default=none) -%}
1111

1212
{% do return({'start_date': start_date,'stop_date': stop_date}) %}
1313

macros/materialisations/vault_insert_by_period_materialization.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
{%- set full_refresh_mode = (should_full_refresh()) -%}
99

10-
{%- set period = config.get('period', default='day') -%}
10+
{%- set period = automate_dv.config_meta_get('period', default='day') -%}
1111

1212
{#- Raise the errors/warnings in this order so that we do not get both -#}
1313
{%- if period == 'microsecond' -%}
@@ -22,8 +22,8 @@
2222
{%- set existing_relation = load_relation(this) -%}
2323
{%- set tmp_relation = make_temp_relation(target_relation) -%}
2424

25-
{%- set timestamp_field = config.require('timestamp_field') -%}
26-
{%- set date_source_models = config.get('date_source_models', default=none) -%}
25+
{%- set timestamp_field = automate_dv.config_meta_require('timestamp_field') -%}
26+
{%- set date_source_models = automate_dv.config_meta_get('date_source_models', default=none) -%}
2727

2828
{%- set start_stop_dates = automate_dv.get_start_stop_dates(timestamp_field, date_source_models) | as_native -%}
2929

macros/materialisations/vault_insert_by_rank_materialization.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
{%- set existing_relation = load_relation(this) -%}
1919
{%- set tmp_relation = make_temp_relation(target_relation) -%}
2020

21-
{%- set rank_column = config.require('rank_column') -%}
22-
{%- set rank_source_models = config.require('rank_source_models') -%}
21+
{%- set rank_column = automate_dv.config_meta_require('rank_column') -%}
22+
{%- set rank_source_models = automate_dv.config_meta_require('rank_source_models') -%}
2323

2424
{%- set min_max_ranks = automate_dv.get_min_max_ranks(rank_column, rank_source_models) | as_native -%}
2525

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{% macro config_meta_get(key, default=none) %}
2+
{%- if config.get(key) != none -%}
3+
{{ return(config.get(key)) }}
4+
{%- elif config.get("meta") != none and (key in config.get("meta", {}).keys()) -%}
5+
{{ return(config.get("meta").get(key)) }}
6+
{%- else -%}
7+
{{ return(default) }}
8+
{%- endif -%}
9+
{% endmacro %}
10+
11+
12+
{% macro config_meta_require(key) %}
13+
{# the first case is required to avoid errors #}
14+
{%- if config == {} -%}
15+
{{ return(none) }}
16+
{%- elif config.get(key) != none -%}
17+
{{ return(config.get(key)) }}
18+
{%- elif config.get("meta") != none and (key in config.get("meta", {}).keys()) -%}
19+
{{ return(config.get("meta").get(key)) }}
20+
{%- else -%}
21+
{% do exceptions.raise_compiler_error("Configuration '" ~ key ~ "' is required but was not found under config or meta (Fusion requires custom configuration under meta)") %}
22+
{%- endif -%}
23+
{% endmacro %}

macros/tables/bigquery/hub.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_nk, src_extra_columns, src_ldts, src_source]) -%}
99

1010
{%- if model.config.materialized == 'vault_insert_by_rank' %}
11-
{%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
11+
{%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
1212
{%- endif %}
1313

1414
{{ 'WITH ' -}}

macros/tables/postgres/hub.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_nk, src_extra_columns, src_ldts, src_source]) -%}
99

1010
{%- if model.config.materialized == 'vault_insert_by_rank' %}
11-
{%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
11+
{%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
1212
{%- endif %}
1313

1414
{{ 'WITH ' -}}

macros/tables/postgres/link.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{%- set fk_cols = automate_dv.expand_column_list([src_fk]) -%}
1010

1111
{%- if model.config.materialized == 'vault_insert_by_rank' %}
12-
{%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
12+
{%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
1313
{%- endif %}
1414

1515
{{ 'WITH ' -}}

macros/tables/postgres/sat.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
{%- macro postgres__sat(src_pk, src_hashdiff, src_payload, src_extra_columns, src_eff, src_ldts, src_source, source_model) -%}
77

8-
{%- set apply_source_filter = config.get('apply_source_filter', false) -%}
8+
{%- set apply_source_filter = automate_dv.config_meta_get('apply_source_filter', false) -%}
99
{%- set enable_ghost_record = var('enable_ghost_records', false) %}
1010

1111
{%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_hashdiff, src_payload, src_extra_columns, src_eff, src_ldts, src_source]) -%}
1212
{%- set window_cols = automate_dv.expand_column_list(columns=[src_pk, src_hashdiff, src_ldts]) -%}
1313
{%- set pk_cols = automate_dv.expand_column_list(columns=[src_pk]) -%}
1414

1515
{%- if model.config.materialized == 'vault_insert_by_rank' %}
16-
{%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
16+
{%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
1717
{%- endif %}
1818

1919
WITH source_data AS (

macros/tables/snowflake/eff_sat.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_dfk, src_sfk, src_extra_columns, src_start_date, src_end_date, src_eff, src_ldts, src_source]) -%}
2525
{%- set fk_cols = automate_dv.expand_column_list(columns=[src_dfk, src_sfk]) -%}
2626
{%- set dfk_cols = automate_dv.expand_column_list(columns=[src_dfk]) -%}
27-
{%- set is_auto_end_dating = config.get('is_auto_end_dating', default=false) %}
27+
{%- set is_auto_end_dating = automate_dv.config_meta_get('is_auto_end_dating', default=false) %}
2828

2929
{%- set max_datetime = automate_dv.max_datetime() %}
3030

macros/tables/snowflake/hub.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
{%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_nk, src_extra_columns, src_ldts, src_source]) -%}
3030

3131
{%- if model.config.materialized == 'vault_insert_by_rank' %}
32-
{%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
32+
{%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
3333
{%- endif %}
3434

3535
{{ 'WITH ' -}}

0 commit comments

Comments
 (0)