Fix quoted identifiers in the generate_base_model macro for BigQuery (

#199) * Use `adapter.quote` to create a case-sensitive quoted identifier for column names * Force a failure for all adapters to help troubleshoot * Revert "Force a failure for all adapters to help troubleshoot" This reverts commit d707832. * Use `adapter.quote` to create a case-sensitive quoted identifier for column names in `generate_base_model` macro
dbt-labs · Nov 21, 2024 · b444bf8 · b444bf8
1 parent c959e4d
commit b444bf8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/integration_tests/macros/operations/create_source_table.sql b/integration_tests/macros/operations/create_source_table.sql
@@ -48,8 +48,8 @@ set enable_case_sensitive_identifier to true;
 {% set create_table_sql_case_sensitive %}
 create table {{ target_schema }}.codegen_integration_tests__data_source_table_case_sensitive as (
     select
-        1 as {% if target.type == "bigquery" %}My_Integer_Col{% else %}"My_Integer_Col"{% endif %},
-        true as {% if target.type == "bigquery" %}My_Bool_Col{% else %}"My_Bool_Col"{% endif %}
+        1 as {{ adapter.quote("My_Integer_Col") }},
+        true as {{ adapter.quote("My_Bool_Col") }}
 )
 {% endset %}
 

diff --git a/integration_tests/tests/test_generate_base_models_all_args.sql b/integration_tests/tests/test_generate_base_models_all_args.sql
@@ -20,8 +20,8 @@ with source as (
 renamed as (
 
     select
-        {% if target.type == "bigquery" %}My_Integer_Col{% else %}"My_Integer_Col"{% endif %}
-        , {% if target.type == "bigquery" %}My_Bool_Col{% else %}"My_Bool_Col"{% endif %}
+        {{ adapter.quote("My_Integer_Col") }}
+        , {{ adapter.quote("My_Bool_Col") }}
 
     from source
 

diff --git a/integration_tests/tests/test_generate_base_models_case_sensitive.sql b/integration_tests/tests/test_generate_base_models_case_sensitive.sql
@@ -16,8 +16,8 @@ with source as (
 renamed as (
 
     select
-        {% if target.type == "bigquery" %}My_Integer_Col{% else %}"My_Integer_Col"{% endif %},
-        {% if target.type == "bigquery" %}My_Bool_Col{% else %}"My_Bool_Col"{% endif %}
+        {{ adapter.quote("My_Integer_Col") }},
+        {{ adapter.quote("My_Bool_Col") }}
 
     from source
 

diff --git a/macros/generate_base_model.sql b/macros/generate_base_model.sql
@@ -25,11 +25,11 @@ renamed as (
     select
         {%- if leading_commas -%}
         {%- for column in column_names %}
-        {{", " if not loop.first}}{% if not case_sensitive_cols %}{{ column | lower }}{% elif target.type == "bigquery" %}{{ column }}{% else %}{{ "\"" ~ column ~ "\"" }}{% endif %}
+        {{", " if not loop.first}}{% if not case_sensitive_cols %}{{ column | lower }}{% else %}{{ adapter.quote(column) }}{% endif %}
         {%- endfor %}
         {%- else -%}
         {%- for column in column_names %}
-        {% if not case_sensitive_cols %}{{ column | lower }}{% elif target.type == "bigquery" %}{{ column }}{% else %}{{ "\"" ~ column ~ "\"" }}{% endif %}{{"," if not loop.last}}
+        {% if not case_sensitive_cols %}{{ column | lower }}{% else %}{{ adapter.quote(column) }}{% endif %}{{"," if not loop.last}}
         {%- endfor -%}
         {%- endif %}