From ba3872abefbf28fcc232fb88be0dd59840d9ec58 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Sun, 27 Sep 2026 15:27:46 +0000 Subject: [PATCH] fix(databricks): qualify Unity Catalog table previews Closes #10399 --- .../src/sql_dialect/identifiers.rs | 18 +++++++- .../src/sql_dialect/table_select.rs | 45 ++++++++++++++++--- .../dbx-sql-dialect/src/sql_dialect/types.rs | 13 +++--- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/crates/dbx-sql-dialect/src/sql_dialect/identifiers.rs b/crates/dbx-sql-dialect/src/sql_dialect/identifiers.rs index fc93d36959..3c890c28d3 100644 --- a/crates/dbx-sql-dialect/src/sql_dialect/identifiers.rs +++ b/crates/dbx-sql-dialect/src/sql_dialect/identifiers.rs @@ -72,9 +72,12 @@ pub fn qualified_table_name(database_type: Option, schema: Option< } /// Like `qualified_table_name`, but also supports 3-part names for SQL Server -/// (`..`) and Doris/StarRocks external catalogs +/// (`..
`), Databricks Unity Catalog +/// (`..
`), and Doris/StarRocks external catalogs /// (`..
`). SQL parsing stores the first segment of a /// 3-part source in `catalog`; for SQL Server that segment is its database. +/// The desktop metadata tree stores a Databricks JDBC catalog in `database`, +/// so Databricks accepts that as a fallback when `catalog` is absent. /// Doris/StarRocks use `schema` as the middle segment when present, otherwise /// `database`, and ignore their built-in `internal` catalog. pub fn qualified_table_name_with_catalog( @@ -85,6 +88,19 @@ pub fn qualified_table_name_with_catalog( table_name: &str, ) -> String { let catalog = catalog.map(str::trim).filter(|catalog| !catalog.is_empty()); + if database_type == Some(DatabaseType::Databricks) { + let catalog = catalog.or_else(|| database.map(str::trim).filter(|database| !database.is_empty())); + let schema = schema.map(str::trim).filter(|schema| !schema.is_empty()); + if let (Some(catalog), Some(schema)) = (catalog, schema) { + return format!( + "{}.{}.{}", + quote_table_identifier(database_type, catalog), + quote_table_identifier(database_type, schema), + quote_table_identifier(database_type, table_name) + ); + } + return qualified_table_name(database_type, schema, table_name); + } match (catalog, database_type) { (Some(database), Some(DatabaseType::SqlServer)) => { let table = qualified_table_name(database_type, schema, table_name); diff --git a/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs b/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs index aecc852437..c2947bff62 100644 --- a/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs +++ b/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs @@ -1080,7 +1080,34 @@ mod tests { } #[test] - fn databricks_table_select_uses_backtick_identifiers() { + fn databricks_table_select_uses_unity_catalog_three_part_name() { + let explicit_catalog = TableDataSelectSqlOptions { + database_type: Some(DatabaseType::Databricks), + catalog: Some("analytics".to_string()), + database: Some("ignored_tree_catalog".to_string()), + schema: Some("sales".to_string()), + table_name: "orders".to_string(), + limit: Some(100), + ..Default::default() + }; + assert_eq!( + build_table_data_select_sql(explicit_catalog), + "SELECT * FROM `analytics`.`sales`.`orders` LIMIT 100;" + ); + + let tree_catalog = TableDataSelectSqlOptions { + database_type: Some(DatabaseType::Databricks), + database: Some("analytics".to_string()), + schema: Some("sales".to_string()), + table_name: "orders".to_string(), + limit: Some(100), + ..Default::default() + }; + assert_eq!(build_table_data_select_sql(tree_catalog), "SELECT * FROM `analytics`.`sales`.`orders` LIMIT 100;"); + } + + #[test] + fn databricks_table_select_without_catalog_keeps_two_part_name() { assert_eq!( build_table_data_select_sql(TableDataSelectSqlOptions { database_type: Some(DatabaseType::Databricks), @@ -1225,13 +1252,19 @@ mod tests { } #[test] - fn external_catalog_is_ignored_for_non_doris_engines() { + fn catalog_qualification_does_not_change_other_dialects() { // Postgres does not support the 3-part catalog naming; the catalog // must be ignored to avoid emitting an invalid qualified name. - let sql = - build_table_data_select_sql(opts(DatabaseType::Postgres, Some("iceberg_catalog"), Some("sales"), "orders")); - assert!(!sql.contains("iceberg_catalog"), "sql was: {sql}"); - assert!(sql.contains("orders"), "sql was: {sql}"); + let sql = build_table_data_select_sql(TableDataSelectSqlOptions { + database_type: Some(DatabaseType::Postgres), + catalog: Some("analytics".to_string()), + database: Some("warehouse".to_string()), + schema: Some("sales".to_string()), + table_name: "orders".to_string(), + limit: Some(10), + ..Default::default() + }); + assert_eq!(sql, "SELECT * FROM \"sales\".\"orders\" LIMIT 10;"); } #[test] diff --git a/crates/dbx-sql-dialect/src/sql_dialect/types.rs b/crates/dbx-sql-dialect/src/sql_dialect/types.rs index bdfe6a79ff..3f979eac81 100644 --- a/crates/dbx-sql-dialect/src/sql_dialect/types.rs +++ b/crates/dbx-sql-dialect/src/sql_dialect/types.rs @@ -28,14 +28,15 @@ pub struct TableDataSelectSqlOptions { #[serde(default, skip_serializing_if = "Option::is_none")] pub schema: Option, pub table_name: String, - /// Doris / StarRocks multi-catalog: when set to a non-`internal` catalog, - /// the FROM clause is prefixed with the catalog - /// (`..
`). + /// Catalog namespace used in three-part table names. Databricks emits + /// `..
`; Doris / StarRocks external catalogs emit + /// `..
`. #[serde(default, skip_serializing_if = "Option::is_none")] pub catalog: Option, - /// Doris / StarRocks multi-catalog: the database under the external - /// catalog, used as the middle segment of the 3-part qualified name when - /// `schema` is absent (Doris/StarRocks have no separate schema concept). + /// Database namespace. For Databricks table nodes this carries the JDBC + /// catalog when the explicit `catalog` field is unavailable. For Doris / + /// StarRocks it is the database under an external catalog and is used as + /// the middle segment when `schema` is absent. #[serde(default, skip_serializing_if = "Option::is_none")] pub database: Option, #[serde(default, skip_serializing_if = "Option::is_none")]