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(schema): list databases and tables on mycat proxies

ZhongTaiab921297529d
diff --git a/apps/desktop/src/stores/__tests__/connectionStore.databaseInfo.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.databaseInfo.spec.ts
index ce51bec868..2445baad45 100644
--- a/apps/desktop/src/stores/__tests__/connectionStore.databaseInfo.spec.ts
+++ b/apps/desktop/src/stores/__tests__/connectionStore.databaseInfo.spec.ts
@@ -214,6 +214,116 @@ describe("connectionStore database info", () => {
expect(listTables).toHaveBeenCalledTimes(2);
});
+ it("refreshes physical table metadata after delayed Mycat detection", async () => {
+ const config = mysqlConnection();
+ let resolveDatabaseInfo!: (value: { productName: string; productVersion: string }) => void;
+ const databaseInfo = new Promise<{ productName: string; productVersion: string }>((resolve) => {
+ resolveDatabaseInfo = resolve;
+ });
+ let useLogicalTables = false;
+ const listTables = vi.fn().mockImplementation(async () => [
+ {
+ name: useLogicalTables ? "order_info" : "order_info_0",
+ table_type: "BASE TABLE",
+ comment: null,
+ },
+ ]);
+
+ vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
+ vi.doMock("@/lib/backend/api", () => ({
+ checkConnectionHealth: vi.fn().mockResolvedValue(undefined),
+ connectDb: vi.fn().mockResolvedValue(config.id),
+ connectionDatabaseInfo: vi.fn(() => databaseInfo),
+ connectionIdentifierQuote: vi.fn().mockResolvedValue(undefined),
+ deleteSchemaCachePrefix: vi.fn().mockResolvedValue(undefined),
+ listDatabases: vi.fn().mockResolvedValue([{ name: "app" }]),
+ listObjects: vi.fn().mockResolvedValue([]),
+ listTables,
+ loadSchemaCache: vi.fn().mockResolvedValue(null),
+ saveConnectionDatabaseInfo: vi.fn().mockImplementation(async () => {
+ useLogicalTables = true;
+ }),
+ saveConnections: vi.fn().mockResolvedValue(undefined),
+ saveSchemaCache: vi.fn().mockResolvedValue(undefined),
+ saveSidebarLayout: vi.fn().mockResolvedValue(undefined),
+ }));
+
+ const { useConnectionStore } = await import("@/stores/connectionStore");
+ const { useSettingsStore } = await import("@/stores/settingsStore");
+ const store = useConnectionStore();
+ useSettingsStore().editorSettings.sidebarObjectDisplay = "simple";
+ await store.addConnection(config);
+ await store.connect(config);
+ await store.loadDatabases(config.id, { force: true });
+ const databaseNode = store.treeNodes[0]?.children?.find((node) => node.type === "database" && node.database === "app");
+ expect(databaseNode).toBeDefined();
+ await store.loadTreeNodeChildren(databaseNode!, { force: true });
+ expect(databaseNode?.children?.filter((node) => node.type === "table").map((node) => node.label)).toEqual(["order_info_0"]);
+
+ resolveDatabaseInfo({ productName: "MySQL", productVersion: "5.6.29-mycat-1.6-RELEASE-20161028204710" });
+
+ await vi.waitFor(() => {
+ const refreshedDatabaseNode = store.treeNodes[0]?.children?.find((node) => node.type === "database" && node.database === "app");
+ expect(refreshedDatabaseNode?.children?.filter((node) => node.type === "table").map((node) => node.label)).toEqual(["order_info"]);
+ });
+ expect(listTables).toHaveBeenCalledTimes(2);
+ });
+
+ it("refreshes physical table metadata after delayed Mycat detection via serverComment", async () => {
+ const config = mysqlConnection();
+ let resolveDatabaseInfo!: (value: { productName: string; productVersion?: string; serverComment?: string }) => void;
+ const databaseInfo = new Promise<{ productName: string; productVersion?: string; serverComment?: string }>((resolve) => {
+ resolveDatabaseInfo = resolve;
+ });
+ let useLogicalTables = false;
+ const listTables = vi.fn().mockImplementation(async () => [
+ {
+ name: useLogicalTables ? "order_info" : "order_info_0",
+ table_type: "BASE TABLE",
+ comment: null,
+ },
+ ]);
+
+ vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
+ vi.doMock("@/lib/backend/api", () => ({
+ checkConnectionHealth: vi.fn().mockResolvedValue(undefined),
+ connectDb: vi.fn().mockResolvedValue(config.id),
+ connectionDatabaseInfo: vi.fn(() => databaseInfo),
+ connectionIdentifierQuote: vi.fn().mockResolvedValue(undefined),
+ deleteSchemaCachePrefix: vi.fn().mockResolvedValue(undefined),
+ listDatabases: vi.fn().mockResolvedValue([{ name: "app" }]),
+ listObjects: vi.fn().mockResolvedValue([]),
+ listTables,
+ loadSchemaCache: vi.fn().mockResolvedValue(null),
+ saveConnectionDatabaseInfo: vi.fn().mockImplementation(async () => {
+ useLogicalTables = true;
+ }),
+ saveConnections: vi.fn().mockResolvedValue(undefined),
+ saveSchemaCache: vi.fn().mockResolvedValue(undefined),
+ saveSidebarLayout: vi.fn().mockResolvedValue(undefined),
+ }));
+
+ const { useConnectionStore } = await import("@/stores/connectionStore");
+ const { useSettingsStore } = await import("@/stores/settingsStore");
+ const store = useConnectionStore();
+ useSettingsStore().editorSettings.sidebarObjectDisplay = "simple";
+ await store.addConnection(config);
+ await store.connect(config);
+ await store.loadDatabases(config.id, { force: true });
+ const databaseNode = store.treeNodes[0]?.children?.find((node) => node.type === "database" && node.database === "app");
+ expect(databaseNode).toBeDefined();
+ await store.loadTreeNodeChildren(databaseNode!, { force: true });
+ expect(databaseNode?.children?.filter((node) => node.type === "table").map((node) => node.label)).toEqual(["order_info_0"]);
+
+ resolveDatabaseInfo({ productName: "MySQL", serverComment: "Mycat Server 1.6" });
+
+ await vi.waitFor(() => {
+ const refreshedDatabaseNode = store.treeNodes[0]?.children?.find((node) => node.type === "database" && node.database === "app");
+ expect(refreshedDatabaseNode?.children?.filter((node) => node.type === "table").map((node) => node.label)).toEqual(["order_info"]);
+ });
+ expect(listTables).toHaveBeenCalledTimes(2);
+ });
+
it("does not let a pre-detection table request overwrite the refreshed logical tables", async () => {
const config = mysqlConnection();
let resolveDatabaseInfo!: (value: { productName: string; productVersion: string }) => void;
diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts
index 0563ca2982..70a3a411f5 100644
--- a/apps/desktop/src/stores/connectionStore.ts
+++ b/apps/desktop/src/stores/connectionStore.ts
@@ -236,6 +236,7 @@ const MONGO_LEGACY_DRIVER_LABEL = "MongoDB (Legacy)";
const XUGU_TABLE_CHILD_METADATA_AGENT_VERSION = "0.1.23";
const SUPERSEDED_CONNECTION_ATTEMPT_MESSAGE = "Connection attempt was superseded by a newer attempt";
const SHARDINGSPHERE_PROXY_VERSION_MARKER = "shardingsphere-proxy";
+const MYCAT_VERSION_MARKER = "mycat";
export interface EtcdAccessCapabilities {
/** May access cluster-wide administration APIs such as status and leases. */
@@ -250,12 +251,14 @@ const unrestrictedEtcdAccess: EtcdAccessCapabilities = { admin: true, writable:
const restrictedEtcdAccess: EtcdAccessCapabilities = { admin: false, writable: false, writePermissions: [] };
const fallbackEtcdV2Access: EtcdAccessCapabilities = { admin: false, writable: true, writePermissions: null };
-function usesShardingSphereLogicalTables(databaseInfo: DatabaseConnectionInfo | undefined): boolean {
- return databaseInfo?.productVersion?.toLowerCase().includes(SHARDINGSPHERE_PROXY_VERSION_MARKER) === true;
+function usesProxyLogicalTables(databaseInfo: DatabaseConnectionInfo | undefined): boolean {
+ const version = databaseInfo?.productVersion?.toLowerCase() ?? "";
+ const serverComment = databaseInfo?.serverComment?.toLowerCase() ?? "";
+ return version.includes(SHARDINGSPHERE_PROXY_VERSION_MARKER) || version.includes(MYCAT_VERSION_MARKER) || serverComment.includes(MYCAT_VERSION_MARKER);
}
function mysqlTableListSourceChanged(config: ConnectionConfig, databaseInfo: DatabaseConnectionInfo): boolean {
- return config.db_type === "mysql" && usesShardingSphereLogicalTables(config.database_info) !== usesShardingSphereLogicalTables(databaseInfo);
+ return config.db_type === "mysql" && usesProxyLogicalTables(config.database_info) !== usesProxyLogicalTables(databaseInfo);
}
function normalizeTableNameFilter(filter: Partial<TableNameFilter> | undefined | null): TableNameFilter {
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index 4555e6be0a..36a19fdb33 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -720,7 +720,11 @@ async fn list_databases_once(state: &AppState, connection_id: &str) -> Result<Ve
{
db::dolt::list_databases(p).await
}
- PoolKind::Mysql(p, _) if db_config.as_ref().is_some_and(db::mysql_compatible::uses_show_metadata) => {
+ PoolKind::Mysql(p, _)
+ if db_config
+ .as_ref()
+ .is_some_and(|config| db::mysql_compatible::uses_show_metadata(config) || is_mycat_config(config)) =>
+ {
db::mysql::list_databases_show_with_timeout(p, mysql_database_list_timeout)
.await
.map(|databases| filter_mysql_system_databases_for_config(databases, db_config.as_ref()))
@@ -744,10 +748,9 @@ async fn list_databases_once(state: &AppState, connection_id: &str) -> Result<Ve
async fn list_database_metadata_once(state: &AppState, connection_id: &str) -> Result<Vec<db::DatabaseInfo>, String> {
let config = connection_config(state, connection_id).await;
- if config
- .as_ref()
- .is_some_and(|config| db::dolt::is_config(config) || db::mysql_compatible::uses_show_metadata(config))
- {
+ if config.as_ref().is_some_and(|config| {
+ db::dolt::is_config(config) || db::mysql_compatible::uses_show_metadata(config) || is_mycat_config(config)
+ }) {
return list_databases_once(state, connection_id).await;
}
let pool_handle = state.pool_handle(connection_id).await;
@@ -3148,8 +3151,19 @@ fn is_shardingsphere_proxy_version(version: &str) -> bool {
version.as_bytes().windows(MARKER.len()).any(|window| window.eq_ignore_ascii_case(MARKER))
}
+pub(in crate::schema) fn is_mycat_version(version: &str) -> bool {
+ const MARKER: &[u8] = b"mycat";
+ version.as_bytes().windows(MARKER.len()).any(|window| window.eq_ignore_ascii_case(MARKER))
+}
+
+pub(in crate::schema) fn is_mycat_config(config: &ConnectionConfig) -> bool {
+ config.database_info.as_ref().and_then(|info| info.product_version.as_deref()).is_some_and(is_mycat_version)
+ || config.database_info.as_ref().and_then(|info| info.server_comment.as_deref()).is_some_and(is_mycat_version)
+}
+
fn mysql_table_list_source_for_config(config: Option<&ConnectionConfig>) -> MysqlTableListSource {
if config.is_some_and(db::tdsql_mysql::is_config)
+ || config.is_some_and(is_mycat_config)
|| config
.and_then(|config| config.database_info.as_ref())
.and_then(|info| info.product_version.as_deref())
@@ -5148,6 +5162,14 @@ for line in sys.stdin:
assert!(!super::is_shardingsphere_proxy_version("8.0.36-MySQL Community Server"));
}
+ #[test]
+ fn mycat_marker_is_ascii_case_insensitive_and_exact() {
+ assert!(super::is_mycat_version("5.6.29-mycat-1.6-RELEASE-20161028204710"));
+ assert!(super::is_mycat_version("5.6.29-mycat-1.6.7.6"));
+ assert!(super::is_mycat_version("5.7.22-MYCAT-1.6-RELEASE"));
+ assert!(!super::is_mycat_version("8.0.36-MySQL Community Server"));
+ }
+
#[test]
fn mysql_table_list_source_uses_only_saved_shardingsphere_version() {
let mut config = test_connection_config(DatabaseType::Mysql);
@@ -5164,6 +5186,27 @@ for line in sys.stdin:
assert_eq!(mysql_table_list_source_for_config(None), MysqlTableListSource::InformationSchema);
}
+ #[test]
+ fn mysql_table_list_source_uses_mycat_version() {
+ let mut config = test_connection_config(DatabaseType::Mysql);
+ assert_eq!(mysql_table_list_source_for_config(Some(&config)), MysqlTableListSource::InformationSchema);
+
+ config.database_info = Some(DatabaseConnectionInfo {
+ product_version: Some("5.6.29-mycat-1.6-RELEASE-20161028204710".to_string()),
+ ..DatabaseConnectionInfo::default()
+ });
+ assert_eq!(mysql_table_list_source_for_config(Some(&config)), MysqlTableListSource::ShowFullTables);
+ assert!(super::is_mycat_config(&config));
+
+ config.database_info = Some(DatabaseConnectionInfo {
+ product_version: None,
+ server_comment: Some("MyCat Server 1.6".to_string()),
+ ..DatabaseConnectionInfo::default()
+ });
+ assert_eq!(mysql_table_list_source_for_config(Some(&config)), MysqlTableListSource::ShowFullTables);
+ assert!(super::is_mycat_config(&config));
+ }
+
#[test]
fn tdsql_profile_uses_logical_show_full_tables_source() {
let mut config = test_connection_config(DatabaseType::Mysql);
diff --git a/crates/dbx-core/src/schema/providers/native.rs b/crates/dbx-core/src/schema/providers/native.rs
index aadf38df54..0b15965fac 100644
--- a/crates/dbx-core/src/schema/providers/native.rs
+++ b/crates/dbx-core/src/schema/providers/native.rs
@@ -7,9 +7,13 @@ pub(in crate::schema) async fn list_databases(
config: Option<&ConnectionConfig>,
) -> Result<Vec<db::DatabaseInfo>, String> {
match pool {
- PoolKind::Mysql(p, _) if config.is_some_and(db::mysql_compatible::uses_show_metadata) => db::mysql::list_databases_show(p)
- .await
- .map(|databases| filter_mysql_system_databases_for_config(databases, config)),
+ PoolKind::Mysql(p, _)
+ if config.is_some_and(|c| db::mysql_compatible::uses_show_metadata(c) || super::super::is_mycat_config(c)) =>
+ {
+ db::mysql::list_databases_show(p)
+ .await
+ .map(|databases| filter_mysql_system_databases_for_config(databases, config))
+ }
PoolKind::Mysql(p, mode) if *mode == MysqlMode::OceanBaseOracle => db::ob_oracle::list_databases(p).await,
PoolKind::Mysql(p, _) => db::mysql::list_databases(p).await,
PoolKind::Postgres(p) => db::postgres::list_databases(p).await,
@@ -36,7 +40,9 @@ pub(in crate::schema) async fn list_tables(
schema: &str,
) -> Result<Vec<db::TableInfo>, String> {
match pool {
- PoolKind::Mysql(p, _) if config.is_some_and(db::mysql_compatible::uses_show_metadata) => {
+ PoolKind::Mysql(p, _)
+ if config.is_some_and(|c| db::mysql_compatible::uses_show_metadata(c) || super::super::is_mycat_config(c)) =>
+ {
db::mysql::list_tables_show(p, database).await
}
PoolKind::Mysql(p, mode) if *mode == MysqlMode::OceanBaseOracle => {