Merge pull request #131 from oracle/dev/v1.7.2

dev/v1.7.2

Author: aosingh

Makefile

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

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.7.4"
+version = "1.7.7"

dbt/include/oracle/macros/adapters.sql

@@ -40,7 +40,11 @@
       {%- if col['data_type'] is not defined -%}
         {{ col_err.append(col['name']) }}
       {%- endif -%}
+      {%- 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 %}
@@ -362,7 +366,11 @@
            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/catalog.sql

@@ -27,7 +27,9 @@
                      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)
                  union all
                  select SYS_CONTEXT('userenv', 'DB_NAME'),
                    owner,

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

@@ -22,6 +22,26 @@ 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/package-lock.yml

@@ -0,0 +1,6 @@
+packages:
+- package: dbt-labs/dbt_utils
+  version: 0.8.6
+- package: Snowflake-Labs/dbt_constraints
+  version: 0.4.2
+sha1_hash: 7664cb2e33183f39e86a72079d63607e43a50ad8

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.7,<1.8
 cx_Oracle==8.3.0
-oracledb==2.0.0
+oracledb==2.0.1