Fixed materialized view replacement and full refresh

Author: aosingh

dbt/adapters/oracle/relation.py

@@ -36,6 +36,7 @@
     OracleRefreshModeConfigChange,
     OracleBuildModeConfigChange,
     OracleQueryRewriteConfigChange,
+    OracleQueryConfigChange,
     OracleQuotePolicy,
     OracleIncludePolicy)
 
@@ -108,14 +109,20 @@ def materialized_view_config_changeset(
                 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=new_materialized_view.refresh_mode)
+                    context=existing_materialized_view.refresh_mode)
 
             if config_change_collection.query_rewrite is None:
                 config_change_collection.query_rewrite = OracleQueryRewriteConfigChange(
@@ -130,10 +137,13 @@ def materialized_view_config_changeset(
             if config_change_collection.build_mode is None:
                 config_change_collection.build_mode = OracleBuildModeConfigChange(
                     action=RelationConfigChangeAction.alter,
-                    context=new_materialized_view.build_mode)
-
-            return config_change_collection
+                    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

dbt/adapters/oracle/relation_configs/__init__.py

@@ -14,12 +14,15 @@
   limitations under the License.
 """
 
-from dbt.adapters.oracle.relation_configs.materialized_view import (OracleMaterializedViewConfig,
-                                                                    OracleMaterializedViewConfigChangeset,
-                                                                    OracleBuildModeConfigChange,
-                                                                    OracleRefreshModeConfigChange,
-                                                                    OracleQueryRewriteConfigChange,
-                                                                    OracleRefreshMethodConfigChange)
+from dbt.adapters.oracle.relation_configs.materialized_view import (
+    OracleMaterializedViewConfig,
+    OracleMaterializedViewConfigChangeset,
+    OracleBuildModeConfigChange,
+    OracleRefreshModeConfigChange,
+    OracleQueryConfigChange,
+    OracleQueryRewriteConfigChange,
+    OracleRefreshMethodConfigChange)
 
-from dbt.adapters.oracle.relation_configs.policies import (OracleQuotePolicy,
-                                                           OracleIncludePolicy)
+from dbt.adapters.oracle.relation_configs.policies import (
+    OracleQuotePolicy,
+    OracleIncludePolicy)

dbt/adapters/oracle/relation_configs/materialized_view.py

@@ -128,7 +128,7 @@ def parse_relation_results(cls, relation_results: RelationResults) -> dict:
 
 @dataclass(frozen=True, eq=True, unsafe_hash=True)
 class OracleRefreshModeConfigChange(RelationConfigChange):
-    context: Optional[bool] = None
+    context: Optional[str] = None
 
     @property
     def requires_full_refresh(self) -> bool:
@@ -137,35 +137,44 @@ def requires_full_refresh(self) -> bool:
 
 @dataclass(frozen=True, eq=True, unsafe_hash=True)
 class OracleRefreshMethodConfigChange(RelationConfigChange):
-    context: Optional[bool] = None
+    context: Optional[str] = None
 
     @property
     def requires_full_refresh(self) -> bool:
         return True
 
 @dataclass(frozen=True, eq=True, unsafe_hash=True)
 class OracleBuildModeConfigChange(RelationConfigChange):
-    context: Optional[bool] = None
+    context: Optional[str] = None
 
     @property
     def requires_full_refresh(self) -> bool:
         return False
 
 @dataclass(frozen=True, eq=True, unsafe_hash=True)
 class OracleQueryRewriteConfigChange(RelationConfigChange):
-    context: Optional[bool] = None
+    context: Optional[str] = None
 
     @property
     def requires_full_refresh(self) -> bool:
         return False
 
+@dataclass(frozen=True, eq=True, unsafe_hash=True)
+class OracleQueryConfigChange(RelationConfigChange):
+    context: Optional[str] = None
+
+    @property
+    def requires_full_refresh(self) -> bool:
+        return True
+
 
 @dataclass
 class OracleMaterializedViewConfigChangeset:
     refresh_mode: Optional[OracleRefreshMethodConfigChange] = None
     refresh_method: Optional[OracleRefreshMethodConfigChange] = None
     build_mode: Optional[OracleBuildModeConfigChange] = None
     query_rewrite: Optional[OracleQueryRewriteConfigChange] = None
+    query: Optional[OracleQueryConfigChange] = None
 
     @property
     def requires_full_refresh(self) -> bool:
@@ -175,6 +184,7 @@ def requires_full_refresh(self) -> bool:
                 self.refresh_method.requires_full_refresh if self.refresh_method else False,
                 self.build_mode.requires_full_refresh if self.build_mode else False,
                 self.query_rewrite.requires_full_refresh if self.query_rewrite else False,
+                self.query.requires_full_refresh if self.query else False
             }
         )
 
@@ -186,5 +196,6 @@ def has_changes(self) -> bool:
                 self.refresh_method if self.refresh_method else False,
                 self.build_mode if self.build_mode else False,
                 self.query_rewrite if self.query_rewrite else False,
+                self.query if self.query else False
             }
         )

dbt/include/oracle/macros/adapters.sql

@@ -305,6 +305,8 @@
      PRAGMA EXCEPTION_INIT(dne_942, -942);
      attempted_ddl_on_in_use_GTT EXCEPTION;
      pragma EXCEPTION_INIT(attempted_ddl_on_in_use_GTT, -14452);
+     mv_dne_12003 EXCEPTION;
+     PRAGMA EXCEPTION_INIT(mv_dne_12003, -12003);
   BEGIN
      SAVEPOINT start_transaction;
      {%- if relation.is_materialized_view -%}
@@ -318,6 +320,8 @@
         NULL; -- if it its a global temporary table, leave it alone.
      WHEN dne_942 THEN
         NULL;
+     WHEN mv_dne_12003 THEN
+        NULL;
   END;
   {%- endcall %}
 {% endmacro %}

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

@@ -9,11 +9,8 @@
 {%- endmacro %}
 
 {% macro oracle__get_replace_materialized_view_as_sql(relation, sql, existing_relation, backup_relation, intermediate_relation) %}
-    {% call statement(name="drop_mv") %}
-        {{ oracle__drop_relation(relation) }}
-    {% endcall %}
-    {{- log('ORACLE Applying REPLACE to: ' ~ relation) -}}
-    {{ get_create_materialized_view_as_sql(relation, sql) }}
+    {{ oracle__drop_relation(relation) }}
+    {{ oracle__get_create_materialized_view_as_sql(relation, sql) }}
 {% endmacro %}
 
 {% macro oracle__get_create_materialized_view_as_sql(relation, sql) %}

dbt_adbs_test_project/models/sales_internet_mv.sql

@@ -15,4 +15,4 @@
 #}
 {{ config(materialized='materialized_view')}}
 select * from {{ source('sh_database', 'sales') }}
-where channel_id = 4
+where channel_id = 5