Merge pull request #133 from oracle/backports-1.6

v1.6.3

Author: amoghparab1805

Makefile

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

dbt/include/oracle/macros/adapters.sql

@@ -40,7 +40,11 @@
       {%- if col['data_type'] is not defined -%}
         {{ col_err.append(col['name']) }}
       {%- endif -%}
-      cast(null as {{ col['data_type'] }}) as {{ col['name'] }}{{ ", " if not loop.last }}
+      {%- if col['data_type'] | lower == 'clob' -%}
+        empty_clob() as {{ col['name'] }}{{ ", " if not loop.last }}
+      {%- else -%}
+        cast(null as {{ col['data_type'] }}) as {{ col['name'] }}{{ ", " if not loop.last }}
+      {%- endif -%}
     {%- endfor -%}
     {# Override for Oracle #}
      from dual
@@ -268,7 +272,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 }}.{{ column_name }} is {{ escaped_comment }}
+        comment on column {{ relation }}.{{ adapter.check_and_quote_identifier(column_name, model.columns) }} is {{ escaped_comment }}
       {%- endcall %}
     {% endfor %}
   {% endif %}
@@ -384,7 +388,7 @@
            else 'BASE TABLE'
          end table_type
        from sys.all_tables
-       where upper(table_name) not in (select upper(mview_name) from sys.all_mviews)
+       where upper(table_name) not in (select upper(mview_name) from sys.all_mviews where upper(owner) = upper('{{ schema_relation.schema }}'))
        union all
        select SYS_CONTEXT('userenv', 'DB_NAME'),
          owner,

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

@@ -17,7 +17,7 @@
 {% materialization incremental, adapter='oracle', supported_languages=['sql', 'python'] %}
 
   {% set unique_key = config.get('unique_key') %}
-  {% set full_refresh_mode = flags.FULL_REFRESH %}
+  {% set full_refresh_mode = should_full_refresh() %}
   {%- set language = model['language'] -%}
   {% set target_relation = this.incorporate(type='table') %}
   {% set existing_relation = load_relation(this) %}

dbt_adbs_test_project/dbt_project.yml

@@ -18,6 +18,9 @@ quoting:
 seeds:
     dbt_adbs_test_project:
         quote_columns: false
+        kafka_message:
+          +column_types:
+            message: CLOB
         seed_with_empty_col:
           +column_types:
             id: number

dbt_adbs_test_project/models/kafka.sql

@@ -0,0 +1 @@
+select * from {{ ref('kafka_message') }}

dbt_adbs_test_project/models/schema.yml

@@ -18,6 +18,25 @@ sources:
       - name: costs
 
 models:
+  - name: kafka
+    description: kafka_description
+    config:
+      materialized: incremental
+      incremental_strategy: append
+      on_schema_change: fail
+      full_refresh: false
+      contract:
+        enforced: true
+      constraints:
+        - type: not_null
+          columns: [message]
+    columns:
+      - name: message
+        description: Kafka message
+        data_type: CLOB
+        constraints:
+          - type: not_null
+
   - name: people
     columns:
       - name: id

dbt_adbs_test_project/models/us_product_sales_channel_ranking.sql

@@ -17,6 +17,7 @@
     config(
         materialized='incremental',
         unique_key='group_id',
+	full_refresh=false,
         parallel=4,
         table_compression_clause='COLUMN STORE COMPRESS FOR QUERY LOW')
 }}

dbt_adbs_test_project/seeds/kafka_message.csv

@@ -0,0 +1,5 @@
+message
+Jack-Hunter
+Jack-Hunter
+Jack-HunterJackHunter
+Jack-Hunter

requirements.txt

@@ -1,3 +1,3 @@
 dbt-core~=1.6,<1.7
 cx_Oracle==8.3.0
-oracledb==1.4.2
+oracledb==2.0.1

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dbt-oracle
-version = 1.6.2
+version = 1.6.3
 description = dbt (data build tool) adapter for the Oracle database
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -34,7 +34,7 @@ include_package_data = True
 install_requires =
     dbt-core~=1.6,<1.7
     cx_Oracle==8.3.0
-    oracledb==1.4.2
+    oracledb==2.0.1
 test_suite=tests
 test_requires =
     dbt-tests-adapter~=1.6