Merge pull request #79 from oracle/dev/1.4.2

v1.4.2

Author: aosingh

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

@@ -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.4.4
+          pip install pytest dbt-tests-adapter==1.4.5
           pip install -r requirements.txt
           pip install -e .
 

Makefile

@@ -1,5 +1,5 @@
 # Configuration variables
-VERSION=1.4.1
+VERSION=1.4.2
 PROJ_DIR?=$(shell pwd)
 VENV_DIR?=${PROJ_DIR}/.bldenv
 BUILD_DIR=${PROJ_DIR}/build

README.md

@@ -2,6 +2,8 @@
 
 [![PyPI version](https://badge.fury.io/py/dbt-oracle.svg)](https://pypi.python.org/pypi/dbt-oracle)
 [![dbt-tests-adapter](https://github.com/oracle/dbt-oracle/actions/workflows/oracle-xe-adapter-tests.yml/badge.svg)](https://github.com/oracle/dbt-oracle/actions/workflows/oracle-xe-adapter-tests.yml)
+[![dbt-oracle docs](https://img.shields.io/badge/docs-read-blue)](https://docs.getdbt.com/reference/warehouse-setups/oracle-setup)
+[![dbt-oracle license](https://img.shields.io/badge/license-Apache%202.0-blue)][4]
 
 `dbt-oracle` implements [dbt (data build tool)](https://docs.getdbt.com/docs/introduction) functionalities for the Oracle database. 
 
@@ -11,7 +13,14 @@ From version 1.0.0, dbt-oracle is maintained and distributed by Oracle.
 
 ## Installation
 
-For installation, read how you can set up [Oracle profile][1] for dbt.
+```bash
+pip install dbt-oracle
+```
+
+
+## Documentation
+
+Please refer to the [Oracle setup on dbt docs website][1] for documentation.
 
 ## Sample project
 

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.4.4"
+version = "1.4.5"

dbt/adapters/oracle/connection_helper.py

@@ -106,7 +106,6 @@ class OracleDriverType(str, enum.Enum):
     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: "

dbt/include/oracle/macros/adapters.sql

@@ -114,8 +114,10 @@
     global temporary
   {%- endif %} table {{ relation.include(schema=(not temporary)) }}
   {% if temporary -%} on commit preserve rows {%- endif %}
-  {% if parallel %} parallel {{ parallel }}{% endif %}
-  {% if compression_clause %} {{ compression_clause }} {% endif %}
+  {% if not temporary -%}
+    {% if parallel %} parallel {{ parallel }}{% endif %}
+    {% if compression_clause %} {{ compression_clause }} {% endif %}
+  {%- endif %}
   as
     {{ sql }}
 

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

@@ -93,19 +93,21 @@
 
 
 {% macro oracle__get_incremental_append_sql(args_dict) %}
+    {%- set parallel = config.get('parallel', none) -%}
     {%- 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 INTO {{ target_relation }} ({{ dest_cols_csv }})
+    INSERT INTO {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %} {{ target_relation }} ({{ dest_cols_csv }})
     (
        SELECT {{ dest_cols_csv }}
        FROM {{ temp_relation }}
     )
 {% endmacro %}
 
 {% macro oracle__get_incremental_merge_sql(args_dict) %}
+    {%- set parallel = config.get('parallel', none) -%}
     {%- set dest_columns = args_dict["dest_columns"] -%}
     {%- set temp_relation = args_dict["temp_relation"] -%}
     {%- set target_relation = args_dict["target_relation"] -%}
@@ -120,7 +122,7 @@
         {%- 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 }} DBT_INTERNAL_DEST
+        merge into {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %} {{ target_relation }} DBT_INTERNAL_DEST
           using {{ temp_relation }} DBT_INTERNAL_SOURCE
           on ({{ unique_key_merge_predicates | join(' AND ') }})
         when matched then
@@ -136,7 +138,7 @@
             {% endfor -%}
           )
     {%- else -%}
-    insert into {{ target_relation }} ({{ dest_cols_csv }})
+    insert into {% if parallel %} /*+parallel({{ parallel }})*/ {% endif %} {{ target_relation }} ({{ dest_cols_csv }})
     (
        select {{ dest_cols_csv }}
        from {{ temp_relation }}

dbt_adbs_test_project/models/us_product_sales_channel_ranking.sql

@@ -16,7 +16,9 @@
 {{
     config(
         materialized='incremental',
-        unique_key='group_id')
+        unique_key='group_id',
+        parallel=4,
+        table_compression_clause='COLUMN STORE COMPRESS FOR QUERY LOW')
 }}
 
 SELECT prod_name, channel_desc, calendar_month_desc,

dbt_adbs_test_project/models/us_product_sales_channel_ranking_append.sql

@@ -0,0 +1,43 @@
+{#
+ Copyright (c) 2022, Oracle and/or its affiliates.
+
+  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.
+#}
+{{
+    config(
+        materialized='incremental',
+        incremental_strategy='append',
+        parallel=4,
+        table_compression_clause='COLUMN STORE COMPRESS FOR QUERY LOW')
+}}
+
+SELECT prod_name, channel_desc, calendar_month_desc,
+   {{ snapshot_hash_arguments(['prod_name', 'channel_desc', 'calendar_month_desc']) }} AS group_id,
+   TO_CHAR(SUM(amount_sold), '9,999,999,999') SALES$,
+   RANK() OVER (ORDER BY SUM(amount_sold)) AS default_rank,
+   RANK() OVER (ORDER BY SUM(amount_sold) DESC NULLS LAST) AS custom_rank
+FROM {{ source('sh_database', 'sales') }}, {{ source('sh_database', 'products') }}, {{ source('sh_database', 'customers') }},
+     {{ source('sh_database', 'times') }}, {{ source('sh_database', 'channels') }}, {{ source('sh_database', 'countries') }}
+WHERE sales.prod_id=products.prod_id AND sales.cust_id=customers.cust_id
+  AND customers.country_id = countries.country_id AND sales.time_id=times.time_id
+  AND sales.channel_id=channels.channel_id
+  AND country_iso_code='US'
+
+{% if is_incremental() %}
+
+  AND times.calendar_month_desc > (SELECT MAX(calendar_month_desc) FROM {{ this }})
+
+{% endif %}
+
+GROUP BY prod_name, channel_desc, calendar_month_desc
+

requirements.txt

@@ -1,4 +1,4 @@
-dbt-core==1.4.4
+dbt-core==1.4.5
 cx_Oracle==8.3.0
 oracledb==1.2.2