github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-15 14:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sidebar): preserve MySQL data tabs on reopen

Browse Source
This commit is contained in:
t8y2 committed 2026-07-31 09:34:28 +08:00
1 parent 2f9fbb4e0a
commit 2dbb32ab5e
2 files changed
+12 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/desktop/src/lib/__tests__/sidebar/dataTabOpenPolicy.spec.ts
Vendored
+10
View File
@@ -82,6 +82,16 @@ describe("dataTabOpenPolicy", () => {
expect(findExistingDataTabCandidate([tab], usersTarget, { openMode: "default", reuseDataTab: false })).toEqual({ tab, match: "same-table" }); expect(findExistingDataTabCandidate([tab], usersTarget, { openMode: "default", reuseDataTab: false })).toEqual({ tab, match: "same-table" });
}); });
it("ignores metadata query schemas for database-scoped tables", () => {
const tab = dataTab("users", "users");
tab.schema = undefined;
tab.tableMeta = { schema: "app", tableName: "users", columns: [], primaryKeys: [] };
const mysqlTarget = { connectionId: "conn", database: "app", tableName: "users" };
expect(canApplyDataTabMetadata(tab, mysqlTarget, new AbortController().signal)).toBe(true);
expect(findExistingDataTabCandidate([tab], mysqlTarget, { openMode: "default", reuseDataTab: false })).toEqual({ tab, match: "same-table" });
});
it("rejects metadata after its request is cancelled", () => { it("rejects metadata after its request is cancelled", () => {
const tab = dataTab("users", "users"); const tab = dataTab("users", "users");
tab.tableMeta = { schema: "public", tableName: "users", columns: [], primaryKeys: [] }; tab.tableMeta = { schema: "public", tableName: "users", columns: [], primaryKeys: [] };
apps/desktop/src/lib/sidebar/dataTabOpenPolicy.ts
+2 -1
View File
@@ -34,7 +34,8 @@ function isSameDatabase(tab: DataTabLike, target: Pick<DataTabTarget, "connectio
} }
function isSameTable(tab: DataTabLike, target: DataTabTarget): boolean { function isSameTable(tab: DataTabLike, target: DataTabTarget): boolean {
return isSameDatabase(tab, target) && (tab.tableMeta?.catalog || "") === (target.catalog || "") && (tab.schema || tab.tableMeta?.schema || "") === (target.schema || "") && (tab.tableMeta?.tableName || tab.title) === target.tableName; const tabSchema = tab.schema || (target.schema ? tab.tableMeta?.schema : undefined) || "";
return isSameDatabase(tab, target) && (tab.tableMeta?.catalog || "") === (target.catalog || "") && tabSchema === (target.schema || "") && (tab.tableMeta?.tableName || tab.title) === target.tableName;
} }
export function canApplyDataTabMetadata(tab: DataTabLike | undefined, target: DataTabTarget, signal?: AbortSignal): boolean { export function canApplyDataTabMetadata(tab: DataTabLike | undefined, target: DataTabTarget, signal?: AbortSignal): boolean {