From 72ababd2b83cdf56687db94f99cdf919b36ecd0e Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Wed, 3 Jun 2026 19:29:39 +0800 Subject: [PATCH] fix(iris): skip schema execution context --- crates/dbx-core/src/query.rs | 30 ++++++++++++++++++- .../main/java/app/dbx/jdbc/DbxJdbcPlugin.java | 2 ++ .../java/app/dbx/jdbc/DbxJdbcPluginTest.java | 7 +++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/crates/dbx-core/src/query.rs b/crates/dbx-core/src/query.rs index d32c65bde6..01d7b45e28 100644 --- a/crates/dbx-core/src/query.rs +++ b/crates/dbx-core/src/query.rs @@ -28,6 +28,24 @@ async fn connection_mysql_query_dialect(state: &AppState, connection_id: &str) - .unwrap_or_default() } +async fn connection_database_type_for_pool_key(state: &AppState, pool_key: &str) -> Option { + let configs = state.configs.read().await; + configs + .iter() + .filter(|(connection_id, _)| { + pool_key.strip_prefix(connection_id.as_str()).is_some_and(|rest| rest.is_empty() || rest.starts_with(':')) + }) + .max_by_key(|(connection_id, _)| connection_id.len()) + .map(|(_, config)| config.db_type) +} + +fn schema_for_execution_context(db_type: Option, schema: Option<&str>) -> Option<&str> { + match db_type { + Some(DatabaseType::Iris) => None, + _ => schema, + } +} + #[derive(Clone, Debug, Default)] pub struct QueryExecutionOptions { pub max_rows: Option, @@ -478,6 +496,7 @@ pub async fn do_execute( .get(pool_key) .map(|config| config.attached_databases.iter().map(|database| database.name.clone()).collect::>()) .unwrap_or_default(); + let pool_db_type = connection_database_type_for_pool_key(state, pool_key).await; let connections = state.connections.read().await; let pool = connections.get(pool_key).ok_or("Connection not found")?; @@ -586,7 +605,7 @@ pub async fn do_execute( let client = client.clone(); let sql = sql.to_string(); let database = database.map(|s| s.to_string()); - let schema = schema.map(|s| s.to_string()); + let schema = schema_for_execution_context(pool_db_type, schema).map(|s| s.to_string()); let max_rows = options.max_rows; let rpc_timeout = query_timeout; drop(connections); @@ -1238,6 +1257,8 @@ async fn exec_tx_explicit_inner( ) -> Result { let conns = state.connections.read().await; if let Some(crate::connection::PoolKind::Agent(client)) = conns.get(pool_key) { + let db_type = connection_database_type_for_pool_key(state, pool_key).await; + let schema = schema_for_execution_context(db_type, schema); let mut client = client.lock().await; let result: db::QueryResult = client.execute_transaction(database, statements, schema).await?; return Ok(db::QueryResult { execution_time_ms: start.elapsed().as_millis(), ..result }); @@ -1626,6 +1647,13 @@ mod tests { assert_eq!(params["timeoutSecs"], 600); } + #[test] + fn iris_execution_context_omits_schema() { + assert_eq!(schema_for_execution_context(Some(DatabaseType::Iris), Some("SQLUser")), None); + assert_eq!(schema_for_execution_context(Some(DatabaseType::Oracle), Some("APP")), Some("APP")); + assert_eq!(schema_for_execution_context(None, Some("APP")), Some("APP")); + } + #[test] fn agent_execute_query_params_default_to_safety_row_limit() { let params = agent_execute_query_params("SELECT * FROM events", None, None, QueryExecutionOptions::default()); diff --git a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java index 366b31cd99..be7d8bb775 100644 --- a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java +++ b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java @@ -44,9 +44,11 @@ public final class DbxJdbcPlugin { private static final int MAX_ROWS = 10_000; private static final JdbcDriverQuirks DEFAULT_QUIRKS = new JdbcDriverQuirks(false, false); private static final JdbcDriverQuirks YASHAN_QUIRKS = new JdbcDriverQuirks(true, true); + private static final JdbcDriverQuirks IRIS_QUIRKS = new JdbcDriverQuirks(true, false); private static final JdbcDriverQuirks ORACLE_QUIRKS = new JdbcDriverQuirks(false, true); private static final List DRIVER_QUIRK_RULES = List.of( new JdbcDriverQuirkRule("jdbc:yasdb:", YASHAN_QUIRKS), + new JdbcDriverQuirkRule("jdbc:iris:", IRIS_QUIRKS), new JdbcDriverQuirkRule("jdbc:oracle:", ORACLE_QUIRKS), new JdbcDriverQuirkRule("jdbc:dm:", ORACLE_QUIRKS) ); diff --git a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java index 4d8af8736e..42fedf251b 100644 --- a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java +++ b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java @@ -173,6 +173,11 @@ final class DbxJdbcPluginTest { "connection_string": "jdbc:yasdb://172.26.128.159:20027/yasdb" } """); + JsonNode iris = MAPPER.readTree(""" + { + "connection_string": "jdbc:IRIS://127.0.0.1:1972/USER" + } + """); JsonNode h2 = MAPPER.readTree(""" { "connection_string": "jdbc:h2:mem:dbx_quirks" @@ -181,6 +186,8 @@ final class DbxJdbcPluginTest { assertEquals(true, DbxJdbcPlugin.driverQuirks(yashan).skipExecutionContext()); assertEquals(true, DbxJdbcPlugin.driverQuirks(yashan).useOracleMetadata()); + assertEquals(true, DbxJdbcPlugin.driverQuirks(iris).skipExecutionContext()); + assertEquals(false, DbxJdbcPlugin.driverQuirks(iris).useOracleMetadata()); assertEquals(false, DbxJdbcPlugin.driverQuirks(h2).skipExecutionContext()); assertEquals(false, DbxJdbcPlugin.driverQuirks(h2).useOracleMetadata()); }