Adapt the unit tests to the changes

Signed-off-by: Anton Zhyltsou <[email protected]>

Author: samgans

tests/unit/macros/adapters/test_metadata_macros.py

@@ -137,7 +137,8 @@ def test_get_uc_tables_sql_with_identifier(self, template_bundle, relation):
               table_name,
               if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), 'table', lower(table_type)) AS table_type,
               lower(data_source_format) AS file_format,
-              table_owner
+              table_owner,
+              if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), lower(table_type), null) AS databricks_table_type
             FROM `system`.`information_schema`.`tables`
             WHERE table_catalog = 'some_database'
               AND table_schema = 'some_schema'
@@ -155,9 +156,10 @@ def test_get_uc_tables_sql_without_identifier(self, template_bundle, mock_schema
               table_name,
               if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), 'table', lower(table_type)) AS table_type,
               lower(data_source_format) AS file_format,
-              table_owner
+              table_owner,
+              if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), lower(table_type), null) AS databricks_table_type
             FROM `system`.`information_schema`.`tables`
-            WHERE table_catalog = 'test_db' 
+            WHERE table_catalog = 'test_db'
               AND table_schema = 'test_schema'
         """  # noqa
         self.assert_sql_equal(result, expected_sql)
@@ -176,9 +178,10 @@ def test_case_sensitivity(self, template_bundle):
               table_name,
               if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), 'table', lower(table_type)) AS table_type,
               lower(data_source_format) AS file_format,
-              table_owner
+              table_owner,
+              if(table_type IN ('EXTERNAL', 'MANAGED', 'MANAGED_SHALLOW_CLONE', 'EXTERNAL_SHALLOW_CLONE'), lower(table_type), null) AS databricks_table_type
             FROM `system`.`information_schema`.`tables`
-            WHERE table_catalog = 'test_db' 
+            WHERE table_catalog = 'test_db'
               AND table_schema = 'test_schema'
               AND table_name = 'test_table'
         """  # noqa

tests/unit/macros/materializations/test_clone_macros.py

@@ -73,7 +73,7 @@ def test_create_or_replace_clone(self, template_bundle, s_relation):
     def test_create_or_replace_clone_external(self, template_bundle, catalog_relation, s_relation):
         sql = self.render_clone_macro(
             template_bundle,
-            "databricks__create_or_replace_clone_external",
+            "create_or_replace_clone_external",
             s_relation,
             template_bundle.relation,
         )

tests/unit/test_adapter.py

@@ -13,8 +13,15 @@
 from dbt.adapters.databricks.credentials import (
     CATALOG_KEY_IN_SESSION_PROPERTIES,
 )
-from dbt.adapters.databricks.impl import get_identifier_list_string
-from dbt.adapters.databricks.relation import DatabricksRelation, DatabricksRelationType
+from dbt.adapters.databricks.impl import (
+    DatabricksRelationInfo,
+    get_identifier_list_string,
+)
+from dbt.adapters.databricks.relation import (
+    DatabricksRelation,
+    DatabricksRelationType,
+    DatabricksTableType,
+)
 from dbt.adapters.databricks.utils import check_not_found_error
 from dbt.config import RuntimeConfig
 from tests.unit.utils import config_from_parts_or_dicts
@@ -356,7 +363,9 @@ def test_list_relations_without_caching__no_relations(self, _):
     @patch("dbt.adapters.databricks.api_client.DatabricksApiClient.create")
     def test_list_relations_without_caching__some_relations(self, _):
         with patch.object(DatabricksAdapter, "get_relations_without_caching") as mocked:
-            mocked.return_value = [("name", "table", "hudi", "owner")]
+            mocked.return_value = [
+                DatabricksRelationInfo("name", "table", "hudi", "owner", "external")
+            ]
             adapter = DatabricksAdapter(Mock(flags={}), get_context("spawn"))
             relations = adapter.list_relations("database", "schema")
             assert len(relations) == 1
@@ -365,13 +374,17 @@ def test_list_relations_without_caching__some_relations(self, _):
             assert relation.database == "database"
             assert relation.schema == "schema"
             assert relation.type == DatabricksRelationType.Table
+            assert relation.databricks_table_type == DatabricksTableType.External
             assert relation.owner == "owner"
+            assert relation.is_external_table
             assert relation.is_hudi
 
     @patch("dbt.adapters.databricks.api_client.DatabricksApiClient.create")
     def test_list_relations_without_caching__hive_relation(self, _):
         with patch.object(DatabricksAdapter, "get_relations_without_caching") as mocked:
-            mocked.return_value = [("name", "table", None, None)]
+            mocked.return_value = [
+                DatabricksRelationInfo("name", "table", None, None, None)
+            ]
             adapter = DatabricksAdapter(Mock(flags={}), get_context("spawn"))
             relations = adapter.list_relations("database", "schema")
             assert len(relations) == 1