fix

Author: ericj-db

dbt/include/databricks/macros/materializations/incremental/strategies.sql

@@ -25,7 +25,9 @@
     {{ return(get_insert_overwrite_sql(source, target)) }}
 {% endmacro %}
 
-{% macro get_common_columns(dest_columns, source_columns) %}
+{% macro get_insert_overwrite_sql(source_relation, target_relation) %}
+    {%- set dest_columns = adapter.get_columns_in_relation(target_relation) | map(attribute='quoted') | list -%}
+    {%- set source_columns = adapter.get_columns_in_relation(source_relation) | map(attribute='quoted') | list -%}
     {%- set common_columns = [] -%}
     {%- for dest_col in dest_columns -%}
       {%- if dest_col in source_columns -%}
@@ -34,13 +36,6 @@
         {%- do common_columns.append('DEFAULT') -%}
       {%- endif -%}
     {%- endfor -%}
-    {{ return(common_columns) }}
-{% endmacro %}
-
-{% macro get_insert_overwrite_sql(source_relation, target_relation) %}
-    {%- set dest_columns = adapter.get_columns_in_relation(target_relation) | map(attribute='quoted') | list -%}
-    {%- set source_columns = adapter.get_columns_in_relation(source_relation) | map(attribute='quoted') | list -%}
-    {%- set common_columns = get_common_columns(dest_columns, source_columns) -%}
     {%- set dest_cols_csv = dest_columns | join(', ') -%}
     {%- set source_cols_csv = common_columns | join(', ') -%}
     insert overwrite table {{ target_relation }}
@@ -70,11 +65,18 @@ TABLE {{ temp_relation.render() }}
 {% endmacro %}
 
 {% macro insert_into_sql_impl(target_relation, dest_columns, source_relation, source_columns) %}
-    {%- set common_columns = get_common_columns(dest_columns, source_columns) -%}
+    {%- set common_columns = [] -%}
+    {%- for dest_col in dest_columns -%}
+      {%- if dest_col in source_columns -%}
+        {%- do common_columns.append(dest_col) -%}
+      {%- else -%}
+        {%- do common_columns.append('DEFAULT') -%}
+      {%- endif -%}
+    {%- endfor -%}
     {%- set dest_cols_csv = dest_columns | join(', ') -%}
     {%- set source_cols_csv = common_columns | join(', ') -%}
-    insert into table {{ target_relation }} ({{ dest_cols_csv }})
-    select {{source_cols_csv}} from {{ source_relation }}
+insert into table {{ target_relation }} ({{ dest_cols_csv }})
+select {{source_cols_csv}} from {{ source_relation }}
 {%- endmacro %}
 
 {% macro databricks__get_merge_sql(target, source, unique_key, dest_columns, incremental_predicates) %}