github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-10-23 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(oceanbase): use oracle jdbc url for oracle mode agent

Browse Source
This commit is contained in:
t8y2
2026-06-03 16:18:32 +08:00
parent 0e029eff68
commit b2f6b70b57
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/dbx-core/src/agent_connection.rs
+15 -2
View File
@@ -5,14 +5,14 @@ use crate::models::connection::{ConnectionConfig, DatabaseType};
pub fn agent_connect_params(config: &ConnectionConfig, host: &str, port: u16, database: &str) -> serde_json::Value {
let agent_database = if config.db_type == DatabaseType::MongoDb {
mongo_agent_database(config, database)
} else if config.db_type == DatabaseType::Oracle {
} else if matches!(config.db_type, DatabaseType::Oracle | DatabaseType::OceanbaseOracle) {
oracle_agent_database(config, database)
} else {
database.to_string()
};
let connection_string = if config.db_type == DatabaseType::MongoDb {
config.connection_url_with_host(host, port)
} else if config.db_type == DatabaseType::Oracle {
} else if matches!(config.db_type, DatabaseType::Oracle | DatabaseType::OceanbaseOracle) {
oracle_jdbc_connection_string(config, host, port, database)
} else if matches!(config.db_type, DatabaseType::Kingbase | DatabaseType::Highgo | DatabaseType::Vastbase) {
postgres_like_agent_jdbc_connection_string(config, host, port, database)
@@ -317,6 +317,19 @@ mod tests {
assert_eq!(params["sysdba"], true);
}
#[test]
fn oceanbase_oracle_uses_oracle_jdbc_connection_string_for_agent_protocol() {
let mut cfg = config(DatabaseType::OceanbaseOracle, Some("sys"));
cfg.host = "oceanbase.example.com".to_string();
cfg.port = 2881;
let params = agent_connect_params(&cfg, "oceanbase.example.com", 2881, "sys");
assert_eq!(params["database"], "sys");
assert_eq!(params["sysdba"], false);
assert_eq!(params["connection_string"], "jdbc:oracle:thin:@//oceanbase.example.com:2881/sys");
}
#[test]
fn oracle_url_preserves_custom_jdbc_descriptor_and_rewrites_host_port() {
let mut cfg = config(DatabaseType::Oracle, Some("ORCL"));