refactor: initialize overwrite_src_columns before conditional

Initialize overwrite_src_columns = [] before the if block rather than in the else clause.
This eliminates the redundant else block, makes the intent clearer (variable is always needed),
and follows DRY principle.

Applies to all staging macros: bigquery, snowflake, postgres, redshift, oracle, exasol, trino,
databricks, sqlserver, synapse, fabric.

Author: pkumar-data

macros/staging/bigquery/stage.sql

@@ -155,13 +155,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/databricks/stage.sql

@@ -155,13 +155,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/exasol/stage.sql

@@ -150,13 +150,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/fabric/stage.sql

@@ -149,13 +149,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/oracle/stage.sql

@@ -158,13 +158,12 @@
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
   {% if var('datavault4dbt.show_debug_logs', false) %}{{ log('derived_columns_to select : '~ derived_columns_to_select, false) }}{% endif %}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/postgres/stage.sql

@@ -155,13 +155,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/redshift/stage.sql

@@ -155,13 +155,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/snowflake/stage.sql

@@ -159,13 +159,12 @@
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
   {% if var('datavault4dbt.show_debug_logs', false) %}{{ log('derived_columns_to select : '~ derived_columns_to_select, false) }}{% endif %}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/sqlserver/stage.sql

@@ -149,13 +149,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}
 

macros/staging/synapse/stage.sql

@@ -148,13 +148,12 @@
 {%- set final_columns_to_select = final_columns_to_select + source_columns_to_select -%}
 {%- set derived_columns_to_select = datavault4dbt.process_columns_to_select(source_and_derived_column_names, hashed_column_names) | unique | list -%}
 
+{%- set overwrite_src_columns = [] -%}
 {%- if datavault4dbt.is_something(derived_columns) %}
   {%- set overwrite_src_columns = datavault4dbt.extract_overwrite_columns(derived_columns) -%}
   {#- Getting Data types for derived columns with detection from source relation -#}
   {%- set derived_columns_with_datatypes = datavault4dbt.derived_columns_datatypes(derived_columns, source_relation) -%}
   {%- set derived_columns_with_datatypes_DICT = fromjson(derived_columns_with_datatypes) -%}
-{%- else -%}
-  {%- set overwrite_src_columns = [] -%}
 {%- endif -%}
 {#- Select hashing algorithm -#}