Merge pull request #103 from oracle/dev/1.6.0

dev/1.6.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', '3.11' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11' ]
 
     services:
       oracle_db_xe:
@@ -48,10 +48,9 @@ jobs:
       - name: Install dbt-oracle with core dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pytest dbt-tests-adapter==1.5.3
+          pip install pytest dbt-tests-adapter~=1.6
           pip install -r requirements.txt
           pip install -e .
-          pip install sqlparse==0.4.3
 
       - name: Check create-pem-from-p12 script is installed in bin
         run: |

.gitignore

@@ -146,4 +146,5 @@ doc/build.gitbak
 .venv1.3/
 .venv1.4/
 .venv1.5/
+.venv1.6/
 dbt_adbs_py_test_project

MANIFEST.in

@@ -1,11 +1 @@
-include CONTRIBUTING.rst
-include HISTORY.md
-include LICENSE
-include README.rst
-include README.md
-
-recursive-include tests *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
-
-recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif
+recursive-include dbt/include *.sql *.yml *.md

Makefile

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

dbt/__init__.py

@@ -14,4 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 """
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

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.5.3"
+version = "1.6.0"

dbt/adapters/oracle/connection_helper.py

@@ -20,7 +20,7 @@
 import dbt.exceptions
 from dbt.events import AdapterLogger
 
-from dbt.ui import warning_tag, yellow
+from dbt.ui import warning_tag, yellow, red
 
 logger = AdapterLogger("oracle")
 
@@ -104,14 +104,15 @@ class OracleDriverType(str, enum.Enum):
 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"cx_oracle is no longer maintained, use python-oracledb"
         f"\n\nTo switch to python-oracledb set the environment variable ORA_PYTHON_DRIVER_TYPE=thin "
+        f"\n\nDefault value of ORA_PYTHON_DRIVER_TYPE will be switched to thin started with v1.7.0 "
         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)))
+    logger.warning(warning_tag(red(description)))
     import cx_Oracle as oracledb
 elif ORA_PYTHON_DRIVER_TYPE == OracleDriverType.THICK:
     import oracledb

dbt/adapters/oracle/connections.py

@@ -192,6 +192,9 @@ def open(cls, connection):
             'dsn': dsn
         }
 
+        if oracledb.__name__ == "oracledb":
+            conn_config['connection_id_prefix'] = 'dbt-oracle-'
+
         if credentials.shardingkey:
             conn_config['shardingkey'] = credentials.shardingkey
 

dbt/adapters/oracle/impl.py

@@ -104,11 +104,8 @@ def date_function(cls):
 
     @classmethod
     def convert_text_type(cls, agate_table, col_idx):
-        column = agate_table.columns[col_idx]
-        lens = (len(d.encode("utf-8")) for d in column.values_without_nulls())
-        max_len = max(lens) if lens else 64
-        length = max_len if max_len > 16 else 16
-        return "varchar2({})".format(length)
+        # Keep this consistent with STRING/TEXT datatypes mapped to "VARCHAR2(4000)"
+        return "varchar2(4000)"
 
     @classmethod
     def convert_date_type(cls, agate_table, col_idx):

dbt/adapters/oracle/relation.py

@@ -14,32 +14,136 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 """
-from dataclasses import dataclass, field
+from typing import Optional
 
-from dbt.adapters.base.relation import BaseRelation, Policy
+from dataclasses import dataclass, field
 
+from dbt.adapters.base.relation import BaseRelation
+from dbt.adapters.relation_configs import (
+    RelationConfigBase,
+    RelationConfigChangeAction,
+    RelationResults,
+)
+from dbt.context.providers import RuntimeConfigObject
+from dbt.contracts.graph.nodes import ModelNode
+from dbt.contracts.relation import RelationType
+from dbt.exceptions import DbtRuntimeError
 
-@dataclass
-class OracleQuotePolicy(Policy):
-    database: bool = False
-    schema: bool = False
-    identifier: bool = False
+from dbt.adapters.oracle.relation_configs import (
+    OracleMaterializedViewConfig,
+    OracleRefreshMethodConfigChange,
+    OracleMaterializedViewConfigChangeset,
+    OracleRefreshModeConfigChange,
+    OracleBuildModeConfigChange,
+    OracleQueryRewriteConfigChange,
+    OracleQueryConfigChange,
+    OracleQuotePolicy,
+    OracleIncludePolicy)
 
+from dbt.events import AdapterLogger
 
-@dataclass
-class OracleIncludePolicy(Policy):
-    database: bool = False
-    schema: bool = True
-    identifier: bool = True
+logger = AdapterLogger("oracle")
 
 
 @dataclass(frozen=True, eq=False, repr=False)
 class OracleRelation(BaseRelation):
     quote_policy: OracleQuotePolicy = field(default_factory=lambda: OracleQuotePolicy())
     include_policy: OracleIncludePolicy = field(default_factory=lambda: OracleIncludePolicy())
+    relation_configs = {
+        RelationType.MaterializedView.value: OracleMaterializedViewConfig
+    }
 
     @staticmethod
     def add_ephemeral_prefix(name):
         return f'dbt__cte__{name}__'
 
+    @classmethod
+    def from_runtime_config(cls, runtime_config: RuntimeConfigObject) -> RelationConfigBase:
+        model_node: ModelNode = runtime_config.model
+        relation_type: str = model_node.config.materialized
+
+        if relation_config := cls.relation_configs.get(relation_type):
+            return relation_config.from_model_node(model_node)
+
+        raise DbtRuntimeError(
+            f"from_runtime_config() is not supported for the provided relation type: {relation_type}"
+        )
+
+    @classmethod
+    def materialized_view_config_changeset(
+            cls, relation_results: RelationResults,
+            runtime_config: RuntimeConfigObject) -> Optional[OracleMaterializedViewConfigChangeset]:
+        config_change_collection = OracleMaterializedViewConfigChangeset()
+
+        existing_materialized_view = OracleMaterializedViewConfig.from_relation_results(
+            relation_results
+        )
+        new_materialized_view = OracleMaterializedViewConfig.from_model_node(
+            runtime_config.model
+        )
+
+        assert isinstance(existing_materialized_view, OracleMaterializedViewConfig)
+        assert isinstance(new_materialized_view, OracleMaterializedViewConfig)
+
+        if new_materialized_view.refresh_method.upper() != existing_materialized_view.refresh_method.upper():
+            config_change_collection.refresh_method = OracleRefreshMethodConfigChange(
+                action=RelationConfigChangeAction.alter,
+                context=new_materialized_view.refresh_method
+            )
+
+        if new_materialized_view.refresh_mode.upper() != existing_materialized_view.refresh_mode.upper():
+            config_change_collection.refresh_mode = OracleRefreshModeConfigChange(
+                action=RelationConfigChangeAction.alter,
+                context=new_materialized_view.refresh_mode
+            )
+
+        if new_materialized_view.build_mode.upper() != existing_materialized_view.build_mode.upper():
+            config_change_collection.build_mode = OracleBuildModeConfigChange(
+                action=RelationConfigChangeAction.alter,
+                context=new_materialized_view.build_mode
+            )
+
+        if new_materialized_view.query_rewrite.upper() != existing_materialized_view.query_rewrite.upper():
+            config_change_collection.query_rewrite = OracleQueryRewriteConfigChange(
+                action=RelationConfigChangeAction.alter,
+                context=new_materialized_view.query_rewrite
+            )
+
+        if new_materialized_view.query.upper() != existing_materialized_view.query.upper():
+            config_change_collection.query = OracleQueryConfigChange(
+                action=RelationConfigChangeAction.create,
+                context=new_materialized_view.query
+            )
+
+        logger.debug(f"Config change collection {config_change_collection}")
+
+        if config_change_collection.has_changes:
+
+            if config_change_collection.refresh_mode is None:
+                config_change_collection.refresh_mode = OracleRefreshModeConfigChange(
+                    action=RelationConfigChangeAction.alter,
+                    context=existing_materialized_view.refresh_mode)
+
+            if config_change_collection.query_rewrite is None:
+                config_change_collection.query_rewrite = OracleQueryRewriteConfigChange(
+                    action=RelationConfigChangeAction.alter,
+                    context=existing_materialized_view.query_rewrite)
+
+            if config_change_collection.refresh_method is None:
+                config_change_collection.refresh_method = OracleRefreshMethodConfigChange(
+                    action=RelationConfigChangeAction.alter,
+                    context=existing_materialized_view.refresh_method)
+
+            if config_change_collection.build_mode is None:
+                config_change_collection.build_mode = OracleBuildModeConfigChange(
+                    action=RelationConfigChangeAction.alter,
+                    context=existing_materialized_view.build_mode)
+
+            if config_change_collection.query is None:
+                config_change_collection.query = OracleQueryConfigChange(
+                    action=RelationConfigChangeAction.create,
+                    context=existing_materialized_view.query)
+
+            return config_change_collection
 
+        return None