From f651e3a61fd184fb31f6426d7882dd3e556a8b57 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Wed, 19 Aug 2026 06:29:03 +0000 Subject: [PATCH] fix(iris): avoid quoting ordinary data grid identifiers Closes #6663 --- crates/dbx-core/src/data_grid_sql.rs | 100 +++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/crates/dbx-core/src/data_grid_sql.rs b/crates/dbx-core/src/data_grid_sql.rs index 19061f7876..3defd78ced 100644 --- a/crates/dbx-core/src/data_grid_sql.rs +++ b/crates/dbx-core/src/data_grid_sql.rs @@ -2948,7 +2948,23 @@ pub(crate) fn qualified_table_name( crate::sql_dialect::qualified_table_name(database_type, schema, table_name) } +fn iris_data_grid_identifier(name: &str, identifier_quote: Option<&str>) -> String { + let mut chars = name.chars(); + let ordinary = chars.next().is_some_and(|first| first == '_' || first == '%' || first.is_alphabetic()) + && chars.all(|ch| ch == '_' || ch.is_alphanumeric()); + if ordinary { + // Caché metadata names are case-insensitive. Quoting every ordinary + // name breaks Caché 2016 when delimited identifiers are disabled. + return name.to_string(); + } + let quote = identifier_quote.map(str::trim).filter(|quote| !quote.is_empty()).unwrap_or("\""); + format!("{quote}{}{quote}", name.replace(quote, &format!("{quote}{quote}"))) +} + fn data_grid_identifier(database_type: Option, name: &str, identifier_quote: Option<&str>) -> String { + if database_type == Some(DatabaseType::Iris) { + return iris_data_grid_identifier(name, identifier_quote); + } crate::sql_dialect::quote_table_data_identifier(database_type, name, identifier_quote) } @@ -2960,6 +2976,14 @@ pub(crate) fn data_grid_qualified_table_name( table_name: &str, identifier_quote: Option<&str>, ) -> String { + if database_type == Some(DatabaseType::Iris) { + let table = iris_data_grid_identifier(table_name, identifier_quote); + return schema + .map(str::trim) + .filter(|schema| !schema.is_empty()) + .map(|schema| format!("{}.{table}", iris_data_grid_identifier(schema, identifier_quote))) + .unwrap_or(table); + } if crate::sql_dialect::uses_connection_identifier_quote(database_type, identifier_quote) { crate::sql_dialect::table_data_qualified_table_name(database_type, schema, table_name, identifier_quote) } else { @@ -3205,6 +3229,82 @@ mod tests { ); } + #[test] + fn iris_cache_data_grid_save_uses_unquoted_ordinary_identifiers() { + let result = prepare_data_grid_save(DataGridSaveStatementOptions { + database_type: Some(DatabaseType::Iris), + identifier_quote: None, + table_meta: DataGridTableMeta { + catalog: None, + database: None, + schema: Some("SQLUser".to_string()), + table_name: "PA_PatMas".to_string(), + primary_keys: vec!["PAPMI_RowId".to_string()], + columns: Some(vec![ + column("PAPMI_RowId", "integer", false, None), + column("PAPMI_ID", "varchar(32)", true, None), + ]), + }, + columns: vec!["PAPMI_RowId".to_string(), "PAPMI_ID".to_string()], + source_columns: None, + rows: vec![vec![json!(51), json!("before")]], + dirty_rows: vec![(0, vec![(1, json!("210101202201016555"))])], + deleted_rows: vec![], + new_rows: vec![], + }); + + assert_eq!( + result.statements, + vec!["UPDATE SQLUser.PA_PatMas SET PAPMI_ID = '210101202201016555' WHERE PAPMI_RowId = 51;"] + ); + assert_eq!( + result.rollback_statements, + vec![ + "UPDATE SQLUser.PA_PatMas SET PAPMI_ID = 'before' WHERE PAPMI_RowId = 51 AND PAPMI_ID = '210101202201016555';" + ] + ); + } + + #[test] + fn iris_data_grid_save_quotes_only_delimited_identifiers_across_mutations() { + let result = prepare_data_grid_save(DataGridSaveStatementOptions { + database_type: Some(DatabaseType::Iris), + identifier_quote: Some("\"".to_string()), + table_meta: DataGridTableMeta { + catalog: None, + database: None, + schema: Some("App Schema".to_string()), + table_name: "Patient Record".to_string(), + primary_keys: vec!["Row ID".to_string()], + columns: Some(vec![ + column("Row ID", "integer", false, None), + column("PAPMI_ID", "varchar(32)", true, None), + ]), + }, + columns: vec!["Row ID".to_string(), "PAPMI_ID".to_string()], + source_columns: None, + rows: vec![vec![json!(51), json!("deleted")]], + dirty_rows: vec![], + deleted_rows: vec![0], + new_rows: vec![vec![json!(52), json!("inserted")]], + }); + + assert_eq!( + result.statements, + vec![ + "DELETE FROM \"App Schema\".\"Patient Record\" WHERE \"Row ID\" = 51;", + "INSERT INTO \"App Schema\".\"Patient Record\" (\"Row ID\", PAPMI_ID) VALUES (52, 'inserted');", + ] + ); + assert_eq!( + result.rollback_statements, + vec![ + "DELETE FROM \"App Schema\".\"Patient Record\" WHERE \"Row ID\" = 52 AND PAPMI_ID = 'inserted';", + "INSERT INTO \"App Schema\".\"Patient Record\" (\"Row ID\", PAPMI_ID) VALUES (51, 'deleted');", + ] + ); + } + #[test] fn postgres_keyless_update_preserves_jsonb_array_elements() { let endpoints =