Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(core): gate default secret key path resolution out of test builds

t8y297eef1e72518
diff --git a/crates/dbx-core/src/persistence/secret_codec.rs b/crates/dbx-core/src/persistence/secret_codec.rs
index 00a6bad824..acb9ecb3e8 100644
--- a/crates/dbx-core/src/persistence/secret_codec.rs
+++ b/crates/dbx-core/src/persistence/secret_codec.rs
@@ -493,16 +493,19 @@ fn default_key_path() -> Option<std::path::PathBuf> {
{
return Some(std::env::temp_dir().join("dbx-test-secret.key"));
}
- #[cfg(target_os = "macos")]
- if let Ok(home) = std::env::var("HOME") {
- return Some(std::path::PathBuf::from(home).join("Library/Application Support/dbx/secret.key"));
- }
- if let Ok(config) = std::env::var("XDG_CONFIG_HOME") {
- return Some(std::path::PathBuf::from(config).join("dbx/secret.key"));
+ #[cfg(not(test))]
+ {
+ #[cfg(target_os = "macos")]
+ if let Ok(home) = std::env::var("HOME") {
+ return Some(std::path::PathBuf::from(home).join("Library/Application Support/dbx/secret.key"));
+ }
+ if let Ok(config) = std::env::var("XDG_CONFIG_HOME") {
+ return Some(std::path::PathBuf::from(config).join("dbx/secret.key"));
+ }
+ std::env::var_os("APPDATA").map(std::path::PathBuf::from).map(|path| path.join("dbx/secret.key")).or_else(
+ || std::env::var_os("HOME").map(std::path::PathBuf::from).map(|path| path.join(".config/dbx/secret.key")),
+ )
}
- std::env::var_os("APPDATA").map(std::path::PathBuf::from).map(|path| path.join("dbx/secret.key")).or_else(|| {
- std::env::var_os("HOME").map(std::path::PathBuf::from).map(|path| path.join(".config/dbx/secret.key"))
- })
}
fn aad(namespace: &str, key: &str) -> String {