Merge branch 'main' into new-main

albertosuman-1k5 · web-flow · commit b0044508c962 · 2026-06-23T14:59:05.000+02:00
diff --git a/sqlmesh/core/engine_adapter/databricks.py b/sqlmesh/core/engine_adapter/databricks.py
@@ -431,7 +431,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}
diff --git a/tests/core/engine_adapter/test_databricks.py b/tests/core/engine_adapter/test_databricks.py
@@ -579,8 +579,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"""
     )

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ def columns(`
`431`	`431`	`.order_by("ordinal_position ASC")`
`432`	`432`	`)`
`433`	`433`
`434`		`- self.cursor.execute(query)`
	`434`	`+ self.execute(query.sql(dialect=self.dialect))`
`435`	`435`	`result = self.cursor.fetchall()`
`436`	`436`
`437`	`437`	`return {row[0]: exp.DataType.build(row[1], dialect=self.dialect) for row in result}`
Original file line number	Diff line number	Diff line change
`@@ -579,8 +579,5 @@ def test_columns(mocker: MockFixture, make_mocked_engine_adapter: t.Callable):`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`adapter.cursor.execute.assert_called_once_with(`
`582`		`- parse_one(`
`583`		`- """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""",`
`584`		`- dialect="databricks",`
`585`		`- )`
	`582`	`+ """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"""`
`586`	`583`	`)`