Merge branch 'main' into 1.10.latest

Author: ericj-db

CHANGELOG.md

@@ -1,4 +1,9 @@
-## dbt-databricks 1.10.7 (TBD)
+## dbt-databricks 1.10.8 (TBD)
+
+## dbt-databricks 1.10.7 (July 31, 2025)
+
+### Fixes
+- Do not use `DESCRIBE TABLE EXTENDED .. AS JSON` for STs when DBR version < 17.1. Do not use at all for MVs (not yet supported)
 
 ## dbt-databricks 1.10.6 (July 30, 2025)
 

dbt/adapters/databricks/__version__.py

@@ -1 +1 @@
-version = "1.10.6"
+version = "1.10.7"

dbt/adapters/databricks/impl.py

@@ -481,7 +481,15 @@ def get_columns_in_relation(  # type: ignore[override]
         self, relation: DatabricksRelation
     ) -> list[DatabricksColumn]:
         # Use legacy macros for hive metastore or DBR versions older than 16.2
-        use_legacy_logic = relation.is_hive_metastore() or self.compare_dbr_version(16, 2) < 0
+        use_legacy_logic = (
+            relation.is_hive_metastore()
+            or self.compare_dbr_version(16, 2) < 0
+            or relation.type == DatabricksRelationType.MaterializedView
+            or (
+                relation.type == DatabricksRelationType.StreamingTable
+                and self.compare_dbr_version(17, 1) < 0
+            )
+        )
         return self.get_column_behavior.get_columns_in_relation(self, relation, use_legacy_logic)
 
     def _get_updated_relation(

tests/unit/test_adapter.py

@@ -1094,3 +1094,82 @@ def test_get_columns_new_logic(self, mock_get_columns, adapter, unity_relation):
             assert result[0].column == "col1"
             assert result[0].dtype == "string"
             assert result[0].comment == "comment1"
+
+    @patch(
+        "dbt.adapters.databricks.behaviors.columns.GetColumnsByDescribe._get_columns_with_comments"
+    )
+    def test_get_columns_streaming_table_legacy_logic(
+        self, mock_get_columns, adapter, unity_relation
+    ):
+        streaming_relation = DatabricksRelation.create(
+            database=unity_relation.database,
+            schema=unity_relation.schema,
+            identifier=unity_relation.identifier,
+            type=DatabricksRelation.StreamingTable,
+        )
+        # Return value less than 0 means version is older than 17.1
+        with patch.object(adapter, "compare_dbr_version", return_value=-1):
+            mock_get_columns.return_value = [
+                {"col_name": "stream_col", "data_type": "int", "comment": "streaming col"},
+            ]
+            result = adapter.get_columns_in_relation(streaming_relation)
+            mock_get_columns.assert_called_with(adapter, streaming_relation, "get_columns_comments")
+            assert len(result) == 1
+            assert result[0].column == "stream_col"
+            assert result[0].dtype == "int"
+            assert result[0].comment == "streaming col"
+
+    @patch(
+        "dbt.adapters.databricks.behaviors.columns.GetColumnsByDescribe._get_columns_with_comments"
+    )
+    def test_get_columns_streaming_table_new_logic(self, mock_get_columns, adapter, unity_relation):
+        streaming_relation = DatabricksRelation.create(
+            database=unity_relation.database,
+            schema=unity_relation.schema,
+            identifier=unity_relation.identifier,
+            type=DatabricksRelation.StreamingTable,
+        )
+        # Return value 0 means version is 17.1
+        with patch.object(adapter, "compare_dbr_version", return_value=0):
+            json_data = """
+                {
+                  "columns": [
+                    {
+                      "name": "stream_col",
+                      "type": {"name": "int"},
+                      "comment": "streaming col"
+                    }
+                  ]
+                }
+                """
+            mock_get_columns.return_value = [{"json_metadata": json_data}]
+            result = adapter.get_columns_in_relation(streaming_relation)
+            mock_get_columns.assert_called_with(
+                adapter, streaming_relation, "get_columns_comments_as_json"
+            )
+            assert len(result) == 1
+            assert result[0].column == "stream_col"
+            assert result[0].dtype == "int"
+            assert result[0].comment == "streaming col"
+
+    @patch(
+        "dbt.adapters.databricks.behaviors.columns.GetColumnsByDescribe._get_columns_with_comments"
+    )
+    def test_get_columns_materialized_view(self, mock_get_columns, adapter, unity_relation):
+        mv_relation = DatabricksRelation.create(
+            database=unity_relation.database,
+            schema=unity_relation.schema,
+            identifier=unity_relation.identifier,
+            type=DatabricksRelation.MaterializedView,
+        )
+        # For MVs, always use legacy logic, regardless of DBR version
+        with patch.object(adapter, "compare_dbr_version", return_value=1):
+            mock_get_columns.return_value = [
+                {"col_name": "mv_col", "data_type": "string", "comment": "mv col"},
+            ]
+            result = adapter.get_columns_in_relation(mv_relation)
+            mock_get_columns.assert_called_with(adapter, mv_relation, "get_columns_comments")
+            assert len(result) == 1
+            assert result[0].column == "mv_col"
+            assert result[0].dtype == "string"
+            assert result[0].comment == "mv col"