fix: get_columns_in_relation branching for STs (#1167)

<!-- Please review our pull request review process in CONTRIBUTING.md
before your proceed. -->

Resolves #

<!---
Include the number of the issue addressed by this PR above if
applicable.

  Example:
    resolves #1234

Please review our pull request review process in CONTRIBUTING.md before
your proceed.
-->

### Description

`compare_dbr_version` does not work for SQL warehouses (always returns
1). We should prevent `AS JSON` from running on streaming tables
(supported as of 17.1) until that version becomes current for SQL
warehouses

### Checklist

- [ ] I have run this code in development and it appears to resolve the
stated issue
- [ ] This PR includes tests, or tests are not required/relevant for
this PR
- [ ] I have updated the `CHANGELOG.md` and added information about my
change to the "dbt-databricks next" section.

Author: ericj-db

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Improve ANSI mode error handling for Python models and add debug instrumentation ([1157](https://github.com/databricks/dbt-databricks/pull/1157))
 - Remove external path on intermediate tables for incremental models (with Materialization V2) ([1161](https://github.com/databricks/dbt-databricks/pull/1161))
+- Fix get_columns_in_relation branching logic for streaming tables to prevent it from running `AS JSON`
 
 ## dbt-databricks 1.10.10 (August 20, 2025)
 

dbt/adapters/databricks/impl.py

@@ -485,10 +485,9 @@ def get_columns_in_relation(  # type: ignore[override]
             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
-            )
+            # TODO: Replace with self.compare_dbr_version(17, 1) < 0 when 17.1 is current version
+            #       for SQL warehouses
+            or relation.type == DatabricksRelationType.StreamingTable
         )
         return self.get_column_behavior.get_columns_in_relation(self, relation, use_legacy_logic)
 

tests/unit/test_adapter.py

@@ -1095,11 +1095,12 @@ def test_get_columns_new_logic(self, mock_get_columns, adapter, unity_relation):
             assert result[0].dtype == "string"
             assert result[0].comment == "comment1"
 
+    @pytest.mark.parametrize("compare_dbr_version", [-1, 1])
     @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
+        self, mock_get_columns, adapter, unity_relation, compare_dbr_version
     ):
         streaming_relation = DatabricksRelation.create(
             database=unity_relation.database,
@@ -1108,7 +1109,7 @@ def test_get_columns_streaming_table_legacy_logic(
             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):
+        with patch.object(adapter, "compare_dbr_version", return_value=compare_dbr_version):
             mock_get_columns.return_value = [
                 {"col_name": "stream_col", "data_type": "int", "comment": "streaming col"},
             ]
@@ -1119,39 +1120,6 @@ def test_get_columns_streaming_table_legacy_logic(
             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"
     )