Better quoting for relation names

- Removed hardcoding of quoting configurations from all macros. Config should be picked from dbt project config
- Added 4 new test cases for relation names

Author: aosingh

dbt/include/oracle/macros/adapters.sql

@@ -94,10 +94,9 @@
   {%- set sql_header = config.get('sql_header', none) -%}
 
   {{ sql_header if sql_header is not none }}
-
   create {% if temporary -%}
     global temporary
-  {%- endif %} table {{ relation.include(schema=(not temporary)).quote(schema=False, identifier=False) }}
+  {%- endif %} table {{ relation.include(schema=(not temporary)) }}
   {% if temporary -%} on commit preserve rows {%- endif %}
   as
     {{ sql }}
@@ -112,7 +111,7 @@
 
   create {% if temporary -%}
     global temporary
-  {%- endif %} table {{ relation.include(schema=(not temporary)).quote(schema=False, identifier=False) }}
+  {%- endif %} table {{ relation.include(schema=(not temporary)) }}
   {% if temporary -%} on commit preserve rows {%- endif %}
   as
     {{ sql }}
@@ -122,7 +121,7 @@
   {%- set sql_header = config.get('sql_header', none) -%}
 
   {{ sql_header if sql_header is not none }}
-  create or replace view {{ relation.include(False, True, True).quote(schema=False, identifier=False)  }} as
+  create or replace view {{ relation }} as
     {{ sql }}
 
 {% endmacro %}
@@ -205,7 +204,7 @@
 {% macro oracle__alter_relation_comment(relation, comment) %}
   {% set escaped_comment = oracle_escape_comment(comment) %}
   {# "comment on table" even for views #}
-  comment on table {{ relation.include(False, True, True).quote(schema=False, identifier=False) }} is {{ escaped_comment }}
+  comment on table {{ relation }} is {{ escaped_comment }}
 {% endmacro %}
 
 {% macro oracle__persist_docs(relation, model, for_relation, for_columns) -%}
@@ -218,7 +217,7 @@
       {% set comment = column_dict[column_name]['description'] %}
       {% set escaped_comment = oracle_escape_comment(comment) %}
       {% call statement('alter _column comment', fetch_result=False) -%}
-        comment on column {{ relation.include(False, True, True).quote(schema=False, identifier=False) }}.{{ column_name }} is {{ escaped_comment }}
+        comment on column {{ relation }}.{{ column_name }} is {{ escaped_comment }}
       {%- endcall %}
     {% endfor %}
   {% endif %}
@@ -234,16 +233,16 @@
   {%- set tmp_column = column_name + "__dbt_alter" -%}
 
   {% call statement('alter_column_type 1', fetch_result=False) %}
-    alter table {{ relation.include(False, True, True).quote(schema=False, identifier=False) }} add {{ tmp_column }} {{ new_column_type }}
+    alter table {{ relation }} add {{ tmp_column }} {{ new_column_type }}
   {% endcall %}
   {% call statement('alter_column_type 2', fetch_result=False) %}
-    update {{ relation.include(False, True, True).quote(schema=False, identifier=False)  }} set {{ tmp_column }} = {{ column_name }}
+    update {{ relation  }} set {{ tmp_column }} = {{ column_name }}
   {% endcall %}
   {% call statement('alter_column_type 3', fetch_result=False) %}
-    alter table {{ relation.include(False, True, True).quote(schema=False, identifier=False) }} drop column {{ column_name }} cascade constraints
+    alter table {{ relation }} drop column {{ column_name }} cascade constraints
   {% endcall %}
   {% call statement('alter_column_type 4', fetch_result=False) %}
-    alter table {{ relation.include(False, True, True).quote(schema=False, identifier=False) }} rename column {{ tmp_column }} to {{ column_name }}
+    alter table {{ relation }} rename column {{ tmp_column }} to {{ column_name }}
   {% endcall %}
 
 {% endmacro %}
@@ -257,7 +256,7 @@
      pragma EXCEPTION_INIT(attempted_ddl_on_in_use_GTT, -14452);
   BEGIN
      SAVEPOINT start_transaction;
-     EXECUTE IMMEDIATE 'DROP {{ relation.type }} {{ relation.include(False, True, True).quote(schema=False, identifier=False) }} cascade constraint';
+     EXECUTE IMMEDIATE 'DROP {{ relation.type }} {{ relation }} cascade constraint';
      COMMIT;
   EXCEPTION
      WHEN attempted_ddl_on_in_use_GTT THEN
@@ -272,14 +271,14 @@
   {#-- To avoid `ORA-01702: a view is not appropriate here` we check that the relation to be truncated is a table #}
   {% if relation.is_table %}
     {% call statement('truncate_relation') -%}
-        truncate table {{ relation.include(False, True, True).quote(schema=False, identifier=False) }}
+        truncate table {{ relation }}
     {%- endcall %}
   {% endif %}
 {% endmacro %}
 
 {% macro oracle__rename_relation(from_relation, to_relation) -%}
   {% call statement('rename_relation') -%}
-    ALTER {{ from_relation.type }} {{ from_relation.include(False, True, True).quote(schema=False, identifier=False) }} rename to {{ to_relation.include(False, False, True).quote(schema=False, identifier=False) }}
+    ALTER {{ from_relation.type }} {{ from_relation }} rename to {{ to_relation.include(schema=False) }}
   {%- endcall %}
 {% endmacro %}
 

dbt/include/oracle/macros/materializations/snapshot/snapshot.sql

@@ -51,10 +51,10 @@
 
     snapshotted_data as (
 
-        select {{ target_relation.quote(schema=False, identifier=False) }}.*,
+        select {{ target_relation }}.*,
             {{ strategy.unique_key }} as dbt_unique_key
 
-        from {{ target_relation.quote(schema=False, identifier=False) }}
+        from {{ target_relation }}
         where dbt_valid_to is null
 
     ),

dbt/include/oracle/macros/materializations/snapshot/snapshot_merge.sql

@@ -27,8 +27,8 @@
       {% do dest_cols_csv.append("d." + column) %}
     {% endfor %}
 
-    merge into {{ target.quote(schema=False, identifier=False) }} d
-    using {{ source.quote(schema=False, identifier=False) }} s
+    merge into {{ target }} d
+    using {{ source }} s
     on (s.dbt_scd_id = d.dbt_scd_id)
 
     when matched

dbt/include/oracle/macros/materializations/snapshot/strategies.sql

@@ -84,7 +84,7 @@
     {%- set target_table = node.get('alias', node.get('name')) -%}
 
     {%- set target_relation = adapter.get_relation(database=node_database, schema=node.schema, identifier=target_table) -%}
-    {%- set existing_cols = get_columns_in_query('select * from ' ~ target_relation.quote(schema=False, identifier=False)) -%}
+    {%- set existing_cols = get_columns_in_query('select * from ' ~ target_relation) -%}
     {%- set ns = namespace() -%} {# handle for-loop scoping with a namespace #}
     {%- set ns.column_added = false -%}
 

dbt/include/oracle/macros/materializations/table/table.sql

@@ -18,8 +18,10 @@
   {% set identifier = model['alias'] %}
   {% set tmp_identifier = model['name'] + '__dbt_tmp' %}
   {% set backup_identifier = model['name'] + '__dbt_backup' %}
+  {{ log("SCHEMA __<>>>><<>>>>>>>>>>" ~ schema, info=True) }}
 
   {% set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %}
+  {{ log("FOUND OLD RELATION __<>>>><<>>>>>>>>>>" ~ old_relation, info=True) }}
   {% set target_relation = api.Relation.create(identifier=identifier,
                                                 schema=schema,
                                                 database=database,

tests/functional/adapter/test_quoted_relations.py

@@ -0,0 +1,204 @@
+"""
+Copyright (c) 2022, Oracle and/or its affiliates.
+Copyright (c) 2020, Vitor Avancini
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+"""
+
+import pytest
+
+import datetime
+
+from dbt.tests.util import run_dbt, relation_from_name
+
+
+# seeds/my_seed.csv
+seed_csv = """
+user_id,user_name,birth_date,income,last_login_date
+1,Easton,1981-05-20,40000,2022-04-25T08:57:59
+2,Lillian,1978-09-03,54000,2022-04-25T08:58:59
+3,Jeremiah,1982-03-11,10000,2022-04-25T09:57:59
+4,Nolan,1976-05-06,900000,2022-04-25T09:58:59
+""".lstrip()
+
+# models/foo.sql
+my_model_foo_sql = """
+{{config(materialized='table', 
+         alias="foo")}}
+SELECT * FROM {{ ref('seed') }}
+"""
+
+# models/foo2.sql
+my_model_foo2_sql = """
+{{config(materialized='table', 
+         alias="Foo")}}
+SELECT * FROM {{ ref('seed') }}
+"""
+
+
+class TestQuotedLowerCaseTableName:
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {
+            "seed.csv": seed_csv,
+        }
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "my_model_foo.sql": my_model_foo_sql,
+        }
+
+    @pytest.fixture(scope="class")
+    def project_config_update(self):
+        return {
+            "quoting": {
+                "database": False,
+                "schema": False,
+                "identifier": True
+            },
+        }
+
+    def test_run_dbt(self, project):
+        """
+            - run seed
+            - run model
+
+        """
+        results = run_dbt(['seed'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        sql = 'SELECT COUNT(*) from "foo"'
+        result = project.run_sql(sql, fetch="all")
+        assert result == [(4,)]
+
+
+class TestQuotedTitleCaseTableName:
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {
+            "seed.csv": seed_csv,
+        }
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "my_model_foo.sql": my_model_foo2_sql,
+        }
+
+    @pytest.fixture(scope="class")
+    def project_config_update(self):
+        return {
+            "quoting": {
+                "database": False,
+                "schema": False,
+                "identifier": True
+            },
+        }
+
+    def test_run_dbt(self, project):
+        """
+            - run seed
+            - run model
+
+        """
+        results = run_dbt(['seed'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        sql = 'SELECT COUNT(*) from "Foo"'
+        result = project.run_sql(sql, fetch="all")
+        assert result == [(4,)]
+
+
+class TestUnQuotedLowerCaseTableName:
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {
+            "seed.csv": seed_csv,
+        }
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "my_model_foo.sql": my_model_foo_sql,
+        }
+
+    def test_run_dbt(self, project):
+        """
+            - run seed
+            - run model
+
+        """
+        results = run_dbt(['seed'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        sql = 'SELECT COUNT(*) from FOO'
+        result = project.run_sql(sql, fetch="all")
+        assert result == [(4,)]
+
+
+class TestUnQuotedTitleCaseTableName:
+
+    @pytest.fixture(scope="class")
+    def seeds(self):
+        return {
+            "seed.csv": seed_csv,
+        }
+
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "my_model_foo.sql": my_model_foo2_sql,
+        }
+
+    def test_run_dbt(self, project):
+        """
+            - run seed
+            - run model
+
+        """
+        results = run_dbt(['seed'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        results = run_dbt(['run'])
+        assert len(results) == 1
+
+        sql = 'SELECT COUNT(*) from FOO'
+        result = project.run_sql(sql, fetch="all")
+        assert result == [(4,)]
+
+