Merge branch 'main' into snowflake_ignore_case

dbt-labs · Oct 25, 2024 · 59d3174 · 59d3174
2 parents 093f967 + b95d4e3
commit 59d3174
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/macros/common/stage_external_sources.sql b/macros/common/stage_external_sources.sql
@@ -17,7 +17,7 @@
                             {% do sources_to_stage.append(node) %}
                         {% endif %}
                     {% else %}
-                        {% if src == node.source_name %}
+                        {% if src == node.name %}
                             {% do sources_to_stage.append(node) %}
                         {% endif %}
                     {% endif %}

diff --git a/macros/plugins/snowflake/create_external_table.sql b/macros/plugins/snowflake/create_external_table.sql
@@ -42,9 +42,9 @@
                         {{column.expression}}
                     {%- else -%}
                         {%- if ignore_case -%}
-                        {%- set col_id = 'value:c' ~ loop.index if is_csv else 'GET_IGNORE_CASE($1, ' ~ "'"~ column_alias ~"'"~ ')' -%}
+                        {%- set col_id = 'value:c' ~ loop.index if is_csv else 'GET_IGNORE_CASE($1, ' ~ "'"~ column_quoted ~"'"~ ')' -%}
                         {%- else -%}
-                        {%- set col_id = 'value:c' ~ loop.index if is_csv else 'value:' ~ column_alias -%}
+                        {%- set col_id = 'value:c' ~ loop.index if is_csv else 'value:' ~ column_quoted -%}
                         {%- endif -%}
                         (case when is_null_value({{col_id}}) or lower({{col_id}}) = 'null' then null else {{col_id}} end)
                     {%- endif -%}