Merge branch 'main' into add-databricks-query-tags-session-properties

Author: WhammyLeaf

sqlmesh/core/engine_adapter/databricks.py

@@ -487,7 +487,7 @@ def columns(
             .order_by("ordinal_position ASC")
         )
 
-        self.cursor.execute(query)
+        self.execute(query.sql(dialect=self.dialect))
         result = self.cursor.fetchall()
 
         return {row[0]: exp.DataType.build(row[1], dialect=self.dialect) for row in result}

tests/core/engine_adapter/test_databricks.py

@@ -705,8 +705,5 @@ def test_columns(mocker: MockFixture, make_mocked_engine_adapter: t.Callable):
     }
 
     adapter.cursor.execute.assert_called_once_with(
-        parse_one(
-            """SELECT columns.column_name, columns.full_data_type FROM system.information_schema.columns WHERE table_name = 'test_table' AND table_schema = 'test_db' AND table_catalog = 'test_catalog' ORDER BY ordinal_position ASC""",
-            dialect="databricks",
-        )
+        """SELECT columns.column_name, columns.full_data_type FROM system.information_schema.columns WHERE table_name = 'test_table' AND table_schema = 'test_db' AND table_catalog = 'test_catalog' ORDER BY ordinal_position ASC"""
     )