Merge pull request #71 from oracle/dev/v1.4.0

v1.4.0

Author: aosingh

.github/workflows/oracle-xe-adapter-tests.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
 
     services:
       oracle_db_xe:
@@ -48,7 +48,7 @@ jobs:
       - name: Install dbt-oracle with core dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pytest dbt-tests-adapter==1.3.2
+          pip install pytest dbt-tests-adapter==1.4.1
           pip install -r requirements.txt
           pip install -e .
 

.gitignore

@@ -144,3 +144,4 @@ doc/build.gitbak
 .bldenv
 .venv1.2/
 .venv1.3/
+.venv1.4/

dbt/adapters/oracle/__version__.py

@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 """
-version = "1.3.2"
+version = "1.4.1"

dbt/adapters/oracle/connection_helper.py

@@ -1,9 +1,27 @@
+"""
+Copyright (c) 2023, 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 enum
 import os
 
 import dbt.exceptions
 from dbt.events import AdapterLogger
 
+from dbt.ui import warning_tag, yellow
+
 logger = AdapterLogger("oracle")
 
 
@@ -85,6 +103,16 @@ class OracleDriverType(str, enum.Enum):
 ORA_PYTHON_DRIVER_TYPE = os.getenv('ORA_PYTHON_DRIVER_TYPE', 'cx').upper()
 if ORA_PYTHON_DRIVER_TYPE == OracleDriverType.CX_ORACLE:
     logger.info("Running in cx mode")
+    description = (
+        f"cx_oracle will soon be deprecated, use python-oracledb"
+        f"\n\nTo switch to python-oracledb set the environment variable ORA_PYTHON_DRIVER_TYPE=thin "
+        f"or ORA_PYTHON_DRIVER_TYPE=thick"
+        f"\n\nRead the guideline here: "
+        f"https://docs.getdbt.com/reference/warehouse-setups/oracle-setup#configure-the-python-driver-mode"
+        f"\n\nDocumentation for python-oracledb can be found here: "
+        f"https://oracle.github.io/python-oracledb/"
+    )
+    logger.warning(warning_tag(yellow(description)))
     import cx_Oracle as oracledb
 elif ORA_PYTHON_DRIVER_TYPE == OracleDriverType.THICK:
     import oracledb
@@ -95,5 +123,5 @@ class OracleDriverType(str, enum.Enum):
     SQLNET_ORA_CONFIG = OracleNetConfig.from_env()
     logger.info("Running in thin mode")
 else:
-    raise dbt.exceptions.RuntimeException("Invalid value set for ORA_PYTHON_DRIVER_TYPE\n"
-                                          "Use any one of 'cx', 'thin', or 'thick'")
+    raise dbt.exceptions.DbtRuntimeError("Invalid value set for ORA_PYTHON_DRIVER_TYPE\n"
+                                         "Use any one of 'cx', 'thin', or 'thick'")

dbt/adapters/oracle/connections.py

@@ -190,7 +190,7 @@ def open(cls, connection):
             connection.handle = None
             connection.state = 'fail'
 
-            raise dbt.exceptions.FailedToConnectException(str(e))
+            raise dbt.exceptions.FailedToConnectError(str(e))
 
         return connection
 
@@ -236,18 +236,18 @@ def exception_handler(self, sql):
                 logger.info("Failed to release connection!")
                 pass
 
-            raise dbt.exceptions.DatabaseException(str(e).strip()) from e
+            raise dbt.exceptions.DbtDatabaseError(str(e).strip()) from e
 
         except Exception as e:
             logger.info("Rolling back transaction.")
             self.release()
-            if isinstance(e, dbt.exceptions.RuntimeException):
+            if isinstance(e, dbt.exceptions.DbtRuntimeError):
                 # during a sql query, an internal to dbt exception was raised.
                 # this sounds a lot like a signal handler and probably has
                 # useful information, so raise it without modification.
                 raise e
 
-            raise dbt.exceptions.RuntimeException(e) from e
+            raise dbt.exceptions.DbtRuntimeError(str(e)) from e
 
     @classmethod
     def get_credentials(cls, credentials):

dbt/adapters/oracle/impl.py

@@ -121,7 +121,7 @@ def verify_database(self, database):
             database = database.strip('"')
         expected = self.config.credentials.database
         if expected and database.lower() != expected.lower():
-            raise dbt.exceptions.NotImplementedException(
+            raise dbt.exceptions.DbtRuntimeError(
                 'Cross-db references not allowed in {} ({} vs {})'
                 .format(self.type(), database, expected)
             )
@@ -307,10 +307,8 @@ def quote_seed_column(
         elif quote_config is None:
             pass
         else:
-            raise_compiler_error(
-                f'The seed configuration value of "quote_columns" has an '
-                f'invalid type {type(quote_config)}'
-            )
+            raise dbt.exceptions.CompilationError(f'The seed configuration value of "quote_columns" '
+                                                  f'has an invalid type {type(quote_config)}')
 
         if quote_columns:
             return self.quote(column)

dbt/adapters/oracle/relation.py

@@ -14,12 +14,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 """
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from dbt.adapters.base.relation import BaseRelation, Policy
 
 
-
 @dataclass
 class OracleQuotePolicy(Policy):
     database: bool = False
@@ -36,8 +35,8 @@ class OracleIncludePolicy(Policy):
 
 @dataclass(frozen=True, eq=False, repr=False)
 class OracleRelation(BaseRelation):
-    quote_policy: OracleQuotePolicy = OracleQuotePolicy()
-    include_policy: OracleIncludePolicy = OracleIncludePolicy()
+    quote_policy: OracleQuotePolicy = field(default_factory=lambda: OracleQuotePolicy())
+    include_policy: OracleIncludePolicy = field(default_factory=lambda: OracleIncludePolicy())
 
     @staticmethod
     def add_ephemeral_prefix(name):

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

@@ -59,8 +59,9 @@
 
       {#-- Get the incremental_strategy, the macro to use for the strategy, and build the sql --#}
       {% set incremental_strategy = config.get('incremental_strategy') or 'default' %}
+      {% set incremental_predicates = config.get('predicates', none) or config.get('incremental_predicates', none) %}
       {% set strategy_sql_macro_func = adapter.get_incremental_strategy_macro(context, incremental_strategy) %}
-      {% set strategy_arg_dict = ({'target_relation': target_relation, 'temp_relation': tmp_relation, 'unique_key': unique_key, 'dest_columns': dest_columns }) %}
+      {% set strategy_arg_dict = ({'target_relation': target_relation, 'temp_relation': tmp_relation, 'unique_key': unique_key, 'dest_columns': dest_columns, 'incremental_predicates': incremental_predicates }) %}
       {% set build_sql = strategy_sql_macro_func(strategy_arg_dict) %}
 
   {% endif %}

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

@@ -34,10 +34,10 @@
     )
 {%- endmacro %}
 
-{% macro oracle_check_and_quote_unique_key_for_incremental_merge(unique_key) %}
+{% macro oracle_check_and_quote_unique_key_for_incremental_merge(unique_key, incremental_predicates=none) %}
     {%- set quote = "\"" -%}
     {%- set unique_key_list = [] -%}
-    {%- set unique_key_merge_predicates = [] -%}
+    {%- set unique_key_merge_predicates = [] if incremental_predicates is none else [] + incremental_predicates -%}
     {% if unique_key is sequence and unique_key is not mapping and unique_key is not string %}
           {% for key in unique_key | unique %}
                 {% if adapter.should_identifier_be_quoted(key, model.columns) == true %}
@@ -55,7 +55,7 @@
     {% endif %}
     {% for key in unique_key_list %}
         {% set this_key_match %}
-                temp.{{ key }} = target.{{ key }}
+            DBT_INTERNAL_SOURCE.{{ key }} = DBT_INTERNAL_DEST.{{ key }}
         {% endset %}
         {% do unique_key_merge_predicates.append(this_key_match) %}
     {% endfor %}
@@ -114,24 +114,25 @@
     {%- set dest_cols_csv = get_quoted_column_csv(model, dest_column_names)  -%}
     {%- set merge_update_columns = config.get('merge_update_columns') -%}
     {%- set merge_exclude_columns = config.get('merge_exclude_columns') -%}
+    {%- set incremental_predicates = args_dict["incremental_predicates"] -%}
     {%- set update_columns = get_merge_update_columns(merge_update_columns, merge_exclude_columns, dest_columns) -%}
     {%- if unique_key -%}
-        {%- set unique_key_result = oracle_check_and_quote_unique_key_for_incremental_merge(unique_key) -%}
+        {%- set unique_key_result = oracle_check_and_quote_unique_key_for_incremental_merge(unique_key, incremental_predicates) -%}
         {%- set unique_key_list = unique_key_result['unique_key_list'] -%}
         {%- set unique_key_merge_predicates = unique_key_result['unique_key_merge_predicates'] -%}
-        merge into {{ target_relation }} target
-          using {{ temp_relation }} temp
+        merge into {{ target_relation }} DBT_INTERNAL_DEST
+          using {{ temp_relation }} DBT_INTERNAL_SOURCE
           on ({{ unique_key_merge_predicates | join(' AND ') }})
         when matched then
           update set
           {% for col in update_columns if (col.upper() not in unique_key_list and col not in unique_key_list) -%}
-            target.{{ col }} = temp.{{ col }}{% if not loop.last %}, {% endif %}
+            DBT_INTERNAL_DEST.{{ col }} = DBT_INTERNAL_SOURCE.{{ col }}{% if not loop.last %}, {% endif %}
           {% endfor -%}
         when not matched then
           insert({{ dest_cols_csv }})
           values(
             {% for col in dest_columns -%}
-              temp.{{ adapter.check_and_quote_identifier(col.name, model.columns) }}{% if not loop.last %}, {% endif %}
+              DBT_INTERNAL_SOURCE.{{ adapter.check_and_quote_identifier(col.name, model.columns) }}{% if not loop.last %}, {% endif %}
             {% endfor -%}
           )
     {%- else -%}

requirements.txt

@@ -1,4 +1,4 @@
-dbt-core==1.3.2
+dbt-core==1.4.1
 cx_Oracle==8.3.0
 oracledb==1.2.2