Fixed insert hint and upgraded oracledb driver to 3.1.1

Author: aosingh

dbt/include/oracle/macros/adapters.sql

@@ -422,3 +422,13 @@
     {% set db_name = results.columns[0].values()[0] %}
     {{ return(db_name) }}
 {% endmacro %}
+
+{% macro generate_insert_hint(parallel, insert_mode) %}
+    {% if parallel and insert_mode == 'append' %}
+        /*+parallel({{ parallel }}) append*/
+    {% elif parallel %}
+        /*+parallel({{ parallel }})*/
+    {% elif insert_mode == 'append' %}
+        /*+ append */
+    {% endif %}
+{% endmacro %}

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

@@ -95,13 +95,13 @@
 {% macro oracle__get_incremental_append_sql(args_dict) %}
     {%- set parallel = config.get('parallel', none) -%}
     {%- set insert_mode = config.get('insert_mode', none) -%}
+    {%- set insert_hint = generate_insert_hint(parallel, insert_mode) -%}
     {%- set dest_columns = args_dict["dest_columns"] -%}
     {%- set temp_relation = args_dict["temp_relation"] -%}
     {%- set target_relation = args_dict["target_relation"] -%}
     {%- set dest_column_names = dest_columns | map(attribute='name') | list -%}
     {%- set dest_cols_csv = get_quoted_column_csv(model, dest_column_names)  -%}
-    INSERT {% if parallel %} /*+PARALLEL({{ parallel }})*/ {% endif %}
-    {% if insert_mode == 'append' %} /*+ append */ {% endif %}
+    INSERT {{ insert_hint }}
     INTO {{ target_relation }} ({{ dest_cols_csv }})
     (
        SELECT {{ dest_cols_csv }}
@@ -112,6 +112,7 @@
 {% macro oracle__get_incremental_merge_sql(args_dict) %}
     {%- set parallel = config.get('parallel', none) -%}
     {%- set insert_mode = config.get('insert_mode', none) -%}
+    {%- set insert_hint = generate_insert_hint(parallel, insert_mode) -%}
     {%- set dest_columns = args_dict["dest_columns"] -%}
     {%- set temp_relation = args_dict["temp_relation"] -%}
     {%- set target_relation = args_dict["target_relation"] -%}
@@ -142,8 +143,7 @@
             {% endfor -%}
           )
     {%- else -%}
-    insert {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %}
-    {% if insert_mode == 'append' %} /*+ append */ {% endif %}
+    insert {{ insert_hint }}
     into  {{ target_relation }} ({{ dest_cols_csv }})
     (
        select {{ dest_cols_csv }}
@@ -185,6 +185,7 @@
 {% macro oracle__get_incremental_delete_insert_sql(args_dict) %}
     {%- set parallel = config.get('parallel', none) -%}
     {%- set insert_mode = config.get('insert_mode', none) -%}
+    {%- set insert_hint = generate_insert_hint(parallel, insert_mode) -%}
     {%- set dest_columns = args_dict["dest_columns"] -%}
     {%- set temp_relation = args_dict["temp_relation"] -%}
     {%- set target_relation = args_dict["target_relation"] -%}
@@ -195,15 +196,13 @@
     {%- if unique_key or incremental_predicates -%}
         BEGIN
         EXECUTE IMMEDIATE  '{{ oracle__get_delete_sql_for_delete_insert_strategy(target_relation, temp_relation, unique_key, incremental_predicates) }}';
-        EXECUTE IMMEDIATE 'insert {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %}
-           {% if insert_mode == 'append' %} /*+ append */ {% endif %}
+        EXECUTE IMMEDIATE 'INSERT {{ insert_hint }}
            into {{ target_relation }} ({{ dest_cols_csv }})(
            select {{ dest_cols_csv }}
            from {{ temp_relation }})';
         END;
     {%- else -%}
-    insert {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %}
-    {% if insert_mode == 'append' %} /*+ append */ {% endif %}
+    insert {{ insert_hint }}
     into  {{ target_relation }} ({{ dest_cols_csv }})
     (
        select {{ dest_cols_csv }}

requirements.txt

@@ -1,4 +1,4 @@
 dbt-common>=1.1.0,<2.0
 dbt-adapters>=1.2.1,<2.0
 dbt-core>=1.9.1,<2.0
-oracledb==3.1.0
+oracledb==3.1.1

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     dbt-common>=1.1.0,<2.0
     dbt-adapters>=1.2.1,<2.0
     dbt-core~=1.9,<1.10
-    oracledb==3.1.0
+    oracledb==3.1.1
 test_suite=tests
 test_requires =
     dbt-tests-adapter~=1.10,<1.11

setup.py

@@ -43,7 +43,7 @@
         "dbt-common>=1.1.0,<2.0",
         "dbt-adapters>=1.2.1,<2.0",
         "dbt-core~=1.9,<1.10",
-        "oracledb==3.1.0"
+        "oracledb==3.1.1"
 ]
 
 test_requirements = [