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(oracle): persist the Show Database Links opt-out

Jeff4af7777f490c
diff --git a/crates/dbx-core/examples/table_import_live_bench.rs b/crates/dbx-core/examples/table_import_live_bench.rs
index ab817f4304..aa49c20d83 100644
--- a/crates/dbx-core/examples/table_import_live_bench.rs
+++ b/crates/dbx-core/examples/table_import_live_bench.rs
@@ -176,6 +176,7 @@ fn connection_config(id: &str, database: BenchDatabase) -> Result<ConnectionConf
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/mq/config.rs b/crates/dbx-core/src/admin/mq/config.rs
index 02a45ed30b..a9396c9bb7 100644
--- a/crates/dbx-core/src/admin/mq/config.rs
+++ b/crates/dbx-core/src/admin/mq/config.rs
@@ -201,6 +201,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/mq/service.rs b/crates/dbx-core/src/admin/mq/service.rs
index f7d4a5dbb1..66ec323978 100644
--- a/crates/dbx-core/src/admin/mq/service.rs
+++ b/crates/dbx-core/src/admin/mq/service.rs
@@ -943,6 +943,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/nacos/config.rs b/crates/dbx-core/src/admin/nacos/config.rs
index 48807ed7ee..4eb18afc17 100644
--- a/crates/dbx-core/src/admin/nacos/config.rs
+++ b/crates/dbx-core/src/admin/nacos/config.rs
@@ -388,6 +388,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/admin/nacos/service.rs b/crates/dbx-core/src/admin/nacos/service.rs
index a6bdb162b2..c64df0af63 100644
--- a/crates/dbx-core/src/admin/nacos/service.rs
+++ b/crates/dbx-core/src/admin/nacos/service.rs
@@ -664,6 +664,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -750,6 +751,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/ai/agent_tools.rs b/crates/dbx-core/src/ai/agent_tools.rs
index 487bdf1511..ab9d155242 100644
--- a/crates/dbx-core/src/ai/agent_tools.rs
+++ b/crates/dbx-core/src/ai/agent_tools.rs
@@ -2015,6 +2015,7 @@ for line in sys.stdin:
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/connection/connection_secrets.rs b/crates/dbx-core/src/connection/connection_secrets.rs
index c21a641fe4..395524f605 100644
--- a/crates/dbx-core/src/connection/connection_secrets.rs
+++ b/crates/dbx-core/src/connection/connection_secrets.rs
@@ -1052,6 +1052,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/connection/mod.rs b/crates/dbx-core/src/connection/mod.rs
index 1af73c1fd2..abcee00379 100644
--- a/crates/dbx-core/src/connection/mod.rs
+++ b/crates/dbx-core/src/connection/mod.rs
@@ -7372,6 +7372,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -9889,6 +9890,7 @@ sleep 30
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/src/data/transfer.rs b/crates/dbx-core/src/data/transfer.rs
index a402283364..9a984dc860 100644
--- a/crates/dbx-core/src/data/transfer.rs
+++ b/crates/dbx-core/src/data/transfer.rs
@@ -13290,6 +13290,7 @@ for line in sys.stdin:
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -20185,6 +20186,7 @@ SELECT 1 FROM dual"#
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/persistence/cloud_sync.rs b/crates/dbx-core/src/persistence/cloud_sync.rs
index a172865884..debeff4d7f 100644
--- a/crates/dbx-core/src/persistence/cloud_sync.rs
+++ b/crates/dbx-core/src/persistence/cloud_sync.rs
@@ -3540,6 +3540,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -3627,6 +3628,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -3909,6 +3911,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: Some("CREATE SECRET (TYPE quack, TOKEN 'token-value');".to_string()),
color: None,
diff --git a/crates/dbx-core/src/persistence/storage.rs b/crates/dbx-core/src/persistence/storage.rs
index 363c86ddaa..d4f534fde3 100644
--- a/crates/dbx-core/src/persistence/storage.rs
+++ b/crates/dbx-core/src/persistence/storage.rs
@@ -11543,6 +11543,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -11621,6 +11622,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/query/mod.rs b/crates/dbx-core/src/query/mod.rs
index aa0540c4e5..abb7f4cf96 100644
--- a/crates/dbx-core/src/query/mod.rs
+++ b/crates/dbx-core/src/query/mod.rs
@@ -8176,6 +8176,7 @@ for line in sys.stdin:
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
@@ -11213,6 +11214,7 @@ for line in sys.stdin:
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/safety/production_safety.rs b/crates/dbx-core/src/safety/production_safety.rs
index 672e353bad..c29de9fed1 100644
--- a/crates/dbx-core/src/safety/production_safety.rs
+++ b/crates/dbx-core/src/safety/production_safety.rs
@@ -844,6 +844,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: vec![],
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index 3641c208a9..476b19893a 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -3332,6 +3332,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/src/schema/normalization.rs b/crates/dbx-core/src/schema/normalization.rs
index 576b0c3d6d..058b86ea8e 100644
--- a/crates/dbx-core/src/schema/normalization.rs
+++ b/crates/dbx-core/src/schema/normalization.rs
@@ -165,6 +165,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/tests/connection_url_compatibility.rs b/crates/dbx-core/tests/connection_url_compatibility.rs
index 2e0f0bdd1a..cb616f4c9b 100644
--- a/crates/dbx-core/tests/connection_url_compatibility.rs
+++ b/crates/dbx-core/tests/connection_url_compatibility.rs
@@ -28,6 +28,7 @@ fn mysql_config(username: &str, password: &str, database: Option<&str>) -> Conne
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-core/tests/dump_docs_fixture.rs b/crates/dbx-core/tests/dump_docs_fixture.rs
index 9d7a6d391a..172a470e0b 100644
--- a/crates/dbx-core/tests/dump_docs_fixture.rs
+++ b/crates/dbx-core/tests/dump_docs_fixture.rs
@@ -86,6 +86,7 @@ fn live_postgres_config(
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_docs_annotations.rs b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
index 47a40d3013..63ab0eef7d 100644
--- a/crates/dbx-core/tests/live_postgres_docs_annotations.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
@@ -82,6 +82,7 @@ fn live_postgres_config(
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
index efb11cdf80..75186edaa9 100644
--- a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
@@ -77,6 +77,7 @@ fn live_postgres_config(
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_error_position.rs b/crates/dbx-core/tests/live_postgres_error_position.rs
index 79fef08083..840e68ed2a 100644
--- a/crates/dbx-core/tests/live_postgres_error_position.rs
+++ b/crates/dbx-core/tests/live_postgres_error_position.rs
@@ -231,6 +231,7 @@ fn live_connection_config(
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_query_result_export.rs b/crates/dbx-core/tests/live_postgres_query_result_export.rs
index efd5c5782b..d3f965442c 100644
--- a/crates/dbx-core/tests/live_postgres_query_result_export.rs
+++ b/crates/dbx-core/tests/live_postgres_query_result_export.rs
@@ -82,6 +82,7 @@ fn live_postgres_config(
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_postgres_transfer.rs b/crates/dbx-core/tests/live_postgres_transfer.rs
index 1219d44edb..2f49c13e9b 100644
--- a/crates/dbx-core/tests/live_postgres_transfer.rs
+++ b/crates/dbx-core/tests/live_postgres_transfer.rs
@@ -77,6 +77,7 @@ fn postgres_test_config(id: &str, database: &str) -> ConnectionConfig {
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
index e18ebe5ed6..60c0bd0a3e 100644
--- a/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
+++ b/crates/dbx-core/tests/live_sqlite_to_sqlserver_transfer.rs
@@ -81,6 +81,7 @@ fn sqlite_config(id: &str, path: &str) -> ConnectionConfig {
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_completion.rs b/crates/dbx-core/tests/live_sqlserver_completion.rs
index baca994e1e..fb8d4aa71c 100644
--- a/crates/dbx-core/tests/live_sqlserver_completion.rs
+++ b/crates/dbx-core/tests/live_sqlserver_completion.rs
@@ -83,6 +83,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
index c9d12c6c4a..fe71389980 100644
--- a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
+++ b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
@@ -72,6 +72,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs b/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
index 6e401ed97f..58d663f330 100644
--- a/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
+++ b/crates/dbx-core/tests/live_sqlserver_split_zip_e2e.rs
@@ -88,6 +88,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
show_system_schemas: false,
database_info: None,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
}
}
diff --git a/crates/dbx-core/tests/live_sqlserver_transfer.rs b/crates/dbx-core/tests/live_sqlserver_transfer.rs
index adb477738e..a2a9dffe10 100644
--- a/crates/dbx-core/tests/live_sqlserver_transfer.rs
+++ b/crates/dbx-core/tests/live_sqlserver_transfer.rs
@@ -75,6 +75,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> ConnectionConfig {
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-core/tests/support/mod.rs b/crates/dbx-core/tests/support/mod.rs
index 114f64721a..7460755934 100644
--- a/crates/dbx-core/tests/support/mod.rs
+++ b/crates/dbx-core/tests/support/mod.rs
@@ -197,6 +197,7 @@ pub fn postgres_test_config(id: &str, port: u16) -> ConnectionConfig {
production_databases: vec![],
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
database_info: None,
}
}
diff --git a/crates/dbx-driver-agent/src/agent_connection.rs b/crates/dbx-driver-agent/src/agent_connection.rs
index a8e9d02475..1050089796 100644
--- a/crates/dbx-driver-agent/src/agent_connection.rs
+++ b/crates/dbx-driver-agent/src/agent_connection.rs
@@ -807,6 +807,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-driver-redis/src/lib.rs b/crates/dbx-driver-redis/src/lib.rs
index ff2eeacacb..eff04c2316 100644
--- a/crates/dbx-driver-redis/src/lib.rs
+++ b/crates/dbx-driver-redis/src/lib.rs
@@ -7990,6 +7990,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-types/src/models/connection.rs b/crates/dbx-types/src/models/connection.rs
index 7e16edf60f..7d04eb7554 100644
--- a/crates/dbx-types/src/models/connection.rs
+++ b/crates/dbx-types/src/models/connection.rs
@@ -155,6 +155,9 @@ pub struct ConnectionConfig {
/// Frontend navigation preference: exhaust the paginated Tables group when opened.
#[serde(default, skip_serializing_if = "is_false")]
pub sidebar_auto_load_all_tables: bool,
+ /// Oracle sidebar preference. Absent means shown; only an explicit opt-out is stored.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub show_database_links: Option<bool>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub attached_databases: Vec<AttachedDatabaseConfig>,
/// SQL statements executed right after the connection is established
@@ -643,6 +646,8 @@ struct ConnectionConfigData {
#[serde(default)]
pub sidebar_auto_load_all_tables: bool,
#[serde(default)]
+ pub show_database_links: Option<bool>,
+ #[serde(default)]
pub attached_databases: Vec<AttachedDatabaseConfig>,
#[serde(default)]
pub init_script: Option<String>,
@@ -760,6 +765,7 @@ impl From<ConnectionConfigData> for ConnectionConfig {
visible_schemas: data.visible_schemas,
show_system_schemas: data.show_system_schemas,
sidebar_auto_load_all_tables: data.sidebar_auto_load_all_tables,
+ show_database_links: data.show_database_links,
attached_databases: data.attached_databases,
init_script: data.init_script,
color: data.color,
@@ -3089,6 +3095,26 @@ mod tests {
assert!(serde_json::to_value(configured).unwrap()["sidebar_auto_load_all_tables"].as_bool().unwrap());
}
+ #[test]
+ fn show_database_links_opt_out_round_trips() {
+ let mut value = serde_json::json!({
+ "id": "id",
+ "name": "Oracle",
+ "db_type": "oracle",
+ "host": "localhost",
+ "port": 1521,
+ "username": "system",
+ "password": "",
+ "database": "FREEPDB1"
+ });
+ let legacy: ConnectionConfig = serde_json::from_value(value.clone()).unwrap();
+ assert!(serde_json::to_value(legacy).unwrap().get("show_database_links").is_none());
+
+ value["show_database_links"] = serde_json::json!(false);
+ let hidden: ConnectionConfig = serde_json::from_value(value).unwrap();
+ assert_eq!(serde_json::to_value(hidden).unwrap()["show_database_links"], serde_json::json!(false));
+ }
+
fn mysql_config(username: &str, password: &str, database: Option<&str>) -> ConnectionConfig {
ConnectionConfig {
oracle_oci_nls_lang: None,
@@ -3113,6 +3139,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-web/src/routes/connection.rs b/crates/dbx-web/src/routes/connection.rs
index f03df900e1..c86cdaca86 100644
--- a/crates/dbx-web/src/routes/connection.rs
+++ b/crates/dbx-web/src/routes/connection.rs
@@ -1072,6 +1072,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-web/src/routes/docs.rs b/crates/dbx-web/src/routes/docs.rs
index 6b859a11be..ca4716ddc8 100644
--- a/crates/dbx-web/src/routes/docs.rs
+++ b/crates/dbx-web/src/routes/docs.rs
@@ -225,6 +225,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/crates/dbx-web/src/routes/transfer.rs b/crates/dbx-web/src/routes/transfer.rs
index 152d2bd4ac..c633e0c31b 100644
--- a/crates/dbx-web/src/routes/transfer.rs
+++ b/crates/dbx-web/src/routes/transfer.rs
@@ -760,6 +760,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,
diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs
index 8ec7734fa6..d0e96440bd 100644
--- a/src-tauri/src/commands/connection.rs
+++ b/src-tauri/src/commands/connection.rs
@@ -258,6 +258,7 @@ mod tests {
visible_schemas: None,
show_system_schemas: false,
sidebar_auto_load_all_tables: false,
+ show_database_links: None,
attached_databases: Vec::new(),
init_script: None,
color: None,