Merge remote-tracking branch 'private/release/0.11.3'

Author: DVAlexHiggs

macros/internal/helpers/logging/logging_helpers.sql

@@ -17,7 +17,9 @@
     {%- set max_line_length = length_list | max -%}
     {%- set padding_length = (max_line_length - 7) // 2 -%}
 
-    {%- set border = modules.itertools.repeat('=', padding_length) | join ('') ~ (type | upper) ~ modules.itertools.repeat('=', padding_length) | join ('') -%}
+    {%- set sep = automate_dv.repeat('=', padding_length) %}
+
+    {%- set border = sep ~ (type | upper) ~ sep -%}
 
     {%- set wrapped_message = '\n' ~ border ~ '\n' ~ new_message | join('\n') ~ '\n' ~ border -%}
 

macros/internal/helpers/repeat.sql

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) Business Thinking Ltd. 2019-2025
+ * This software includes code developed by the AutomateDV (f.k.a dbtvault) Team at Business Thinking Ltd. Trading as Datavault
+ */
+
+{%- macro repeat(str_to_repeat, desired_length=0) -%}
+
+    {%- set repeated_string = str_to_repeat * desired_length -%}
+
+    {%- do return(repeated_string | string) -%}
+
+{%- endmacro -%}

macros/materialisations/period_mat_helpers/get_start_stop_dates.sql

@@ -5,9 +5,9 @@
 
 {% macro get_start_stop_dates(timestamp_field, date_source_models) %}
 
-    {% if config.get('start_date', default=none) is not none %}
-        {%- set start_date = config.get('start_date') -%}
-        {%- set stop_date = config.get('stop_date', default=none) -%}
+    {% if automate_dv.config_meta_get('start_date', default=none) is not none %}
+        {%- set start_date = automate_dv.config_meta_get('start_date') -%}
+        {%- set stop_date = automate_dv.config_meta_get('stop_date', default=none) -%}
 
         {% do return({'start_date': start_date,'stop_date': stop_date}) %}
 

macros/materialisations/vault_insert_by_period_materialization.sql

@@ -7,7 +7,7 @@
 
     {%- set full_refresh_mode = (should_full_refresh()) -%}
 
-    {%- set period = config.get('period', default='day') -%}
+    {%- set period = automate_dv.config_meta_get('period', default='day') -%}
 
     {#- Raise the errors/warnings in this order so that we do not get both -#}
     {%- if period == 'microsecond' -%}
@@ -22,8 +22,8 @@
     {%- set existing_relation = load_relation(this) -%}
     {%- set tmp_relation = make_temp_relation(target_relation) -%}
 
-    {%- set timestamp_field = config.require('timestamp_field') -%}
-    {%- set date_source_models = config.get('date_source_models', default=none) -%}
+    {%- set timestamp_field = automate_dv.config_meta_require('timestamp_field') -%}
+    {%- set date_source_models = automate_dv.config_meta_get('date_source_models', default=none) -%}
 
     {%- set start_stop_dates = automate_dv.get_start_stop_dates(timestamp_field, date_source_models) | as_native -%}
 

macros/materialisations/vault_insert_by_rank_materialization.sql

@@ -18,8 +18,8 @@
     {%- set existing_relation = load_relation(this) -%}
     {%- set tmp_relation = make_temp_relation(target_relation) -%}
 
-    {%- set rank_column = config.require('rank_column') -%}
-    {%- set rank_source_models = config.require('rank_source_models') -%}
+    {%- set rank_column = automate_dv.config_meta_require('rank_column') -%}
+    {%- set rank_source_models = automate_dv.config_meta_require('rank_source_models') -%}
 
     {%- set min_max_ranks = automate_dv.get_min_max_ranks(rank_column, rank_source_models) | as_native -%}
 

macros/supporting/fusion_compat.sql

@@ -0,0 +1,23 @@
+{% macro config_meta_get(key, default=none) %}
+    {%- if config.get(key) != none -%}
+        {{ return(config.get(key)) }}
+    {%- elif config.get("meta") != none and (key in config.get("meta", {}).keys()) -%}
+        {{ return(config.get("meta").get(key)) }}
+    {%- else -%}
+        {{ return(default) }}
+    {%- endif -%}
+{% endmacro %}
+
+
+{% macro config_meta_require(key) %}
+    {# the first case is required to avoid errors #}
+    {%- if config == {} -%}
+        {{ return(none) }}
+    {%- elif config.get(key) != none -%}
+        {{ return(config.get(key)) }}
+    {%- elif config.get("meta") != none and (key in config.get("meta", {}).keys()) -%}
+        {{ return(config.get("meta").get(key)) }}
+    {%- else -%}
+        {% do exceptions.raise_compiler_error("Configuration '" ~ key ~ "' is required but was not found under config or meta (Fusion requires custom configuration under meta)") %}
+    {%- endif -%}
+{% endmacro %}

macros/supporting/ghost_records/binary_ghost.sql

@@ -21,7 +21,7 @@
         {%- set zero_string_size = 32 %}
     {%- endif -%}
 
-    {%- set zero_string = modules.itertools.repeat('0', zero_string_size) | join ('') -%}
+    {%- set zero_string = automate_dv.repeat('0', zero_string_size) -%}
 
     {{- automate_dv.cast_binary(column_str=zero_string, alias=alias, quote=true) -}}
 
@@ -40,7 +40,7 @@
     {%- endif -%}
 
     {%- set enable_native_hashes = var('enable_native_hashes', false) -%}
-    {%- set zero_string = modules.itertools.repeat('0', zero_string_size) | join ('') -%}
+    {%- set zero_string = automate_dv.repeat('0', zero_string_size) -%}
 
     {%- if enable_native_hashes -%}
         {%- set column_str = "FROM_HEX('{}')".format(zero_string) -%}

macros/tables/bigquery/hub.sql

@@ -8,7 +8,7 @@
 {%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_nk, src_extra_columns, src_ldts, src_source]) -%}
 
 {%- if model.config.materialized == 'vault_insert_by_rank' %}
-    {%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
+    {%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
 {%- endif %}
 
 {{ 'WITH ' -}}

macros/tables/postgres/hub.sql

@@ -8,7 +8,7 @@
 {%- set source_cols = automate_dv.expand_column_list(columns=[src_pk, src_nk, src_extra_columns, src_ldts, src_source]) -%}
 
 {%- if model.config.materialized == 'vault_insert_by_rank' %}
-    {%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
+    {%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
 {%- endif %}
 
 {{ 'WITH ' -}}

macros/tables/postgres/link.sql

@@ -9,7 +9,7 @@
 {%- set fk_cols = automate_dv.expand_column_list([src_fk]) -%}
 
 {%- if model.config.materialized == 'vault_insert_by_rank' %}
-    {%- set source_cols_with_rank = source_cols + [config.get('rank_column')] -%}
+    {%- set source_cols_with_rank = source_cols + [automate_dv.config_meta_get('rank_column')] -%}
 {%- endif %}
 
 {{ 'WITH ' -}}