25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(core): finish platform key provider Result migration
t8y2d58b3c6a2db6
diff --git a/crates/dbx-core/src/persistence/secret_codec.rs b/crates/dbx-core/src/persistence/secret_codec.rsindex f65d61b3ff..05bcf484e8 100644--- a/crates/dbx-core/src/persistence/secret_codec.rs+++ b/crates/dbx-core/src/persistence/secret_codec.rs@@ -155,13 +155,16 @@ impl SecretCodec {Ok(None) => {}Err(detail) => return Err(detail),}+ if let Some(error) = compatibility_error {+ return Err(error);+ }if allow_create {if let Some(path) = compatibility_path {let codec = create_key_file(&path, false)?;return Ok(SecretKeyResolution { codec, source: SecretKeySource::ManagedDataDir });}}- compatibility_error.map_or_else(|| Err("KEY_PROVIDER_UNAVAILABLE".to_string()), Err)+ Err("KEY_PROVIDER_UNAVAILABLE".to_string())}/// Read an explicitly configured key, then an existing compatibility key@@ -595,7 +598,7 @@ mod tests {let path = directory.path().join("secret.key");let result = SecretCodec::resolve_platform_default(Some(path.clone()), false, |allow_create| {assert!(!allow_create);- None+ Ok(None)});assert!(matches!(result, Err(error) if error == "KEY_PROVIDER_UNAVAILABLE"));assert!(!path.exists());@@ -607,7 +610,7 @@ mod tests {let path = directory.path().join("secret.key");let created = SecretCodec::resolve_platform_default(Some(path.clone()), true, |allow_create| {assert!(allow_create);- None+ Ok(None)}).unwrap();let envelope = created.codec.encrypt("connection", "password", "secret").unwrap();@@ -627,7 +630,7 @@ mod tests {let path = directory.path().join("secret.key");std::fs::write(&path, "\n").unwrap();for allow_create in [false, true] {- let result = SecretCodec::resolve_platform_default(Some(path.clone()), allow_create, |_| None);+ let result = SecretCodec::resolve_platform_default(Some(path.clone()), allow_create, |_| Ok(None));assert!(matches!(result, Err(error) if error == "SECRET_KEY_INVALID"));assert_eq!(std::fs::read_to_string(&path).unwrap(), "\n");}@@ -640,7 +643,7 @@ mod tests {std::fs::write(&compatibility_path, "\n").unwrap();let resolution = SecretCodec::resolve_platform_default(Some(compatibility_path), false, |_| {- Some(SecretCodec::new([9u8; 32]))+ Ok(Some(SecretCodec::new([9u8; 32])))}).unwrap();