diff --git a/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts b/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts index 4e32b5d49b..61a7df9d1f 100644 --- a/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts +++ b/apps/desktop/src/lib/__tests__/tabs/tabPresentation.spec.ts @@ -33,6 +33,7 @@ const translations: Record = { "tabs.tooltipConnection": "Connection:", "tabs.tooltipGroup": "Group:", "tabs.tooltipDatabase": "Database:", + "tabs.tooltipSchema": "Schema:", "tabs.tooltipTable": "Table:", "tabs.tooltipTableComment": "Table Comment:", "tree.events": "Events", @@ -487,6 +488,36 @@ describe("tab group presentation", () => { settings.editorSettings.compactTabTitle = false; }); + it("formats query tab titles with database, schema, and catalog scope", () => { + const store = useConnectionStore(); + store.connections = [ + { id: "conn-1", name: "PostgreSQL", db_type: "postgres", database: "app" } as ConnectionConfig, + { id: "conn-oracle", name: "Oracle", db_type: "oracle", database: "" } as ConnectionConfig, + { id: "conn-doris", name: "Doris", db_type: "doris", database: "analytics" } as ConnectionConfig, + ]; + + expect(tabDisplayTitle(queryTab({ connectionId: "conn-1", database: "app", schema: "public" }), translate)).toBe("PostgreSQL@app.public"); + expect(tabDisplayTitle(queryTab({ connectionId: "conn-1", database: "app", schema: "tenant_a" }), translate)).toBe("PostgreSQL@app.tenant_a"); + expect(tabDisplayTitle(queryTab({ connectionId: "conn-oracle", database: "", schema: "SCOTT" }), translate)).toBe("Oracle@SCOTT"); + expect(tabDisplayTitle(queryTab({ connectionId: "conn-doris", database: "analytics", catalog: "internal", schema: "dim" }), translate)).toBe("Doris@internal.analytics.dim"); + expect(tabDisplayTitle(queryTab({ connectionId: "conn-1", database: "app", schema: "app" }), translate)).toBe("PostgreSQL@app"); + }); + + it("includes schema in tab tooltips when schema is present", () => { + const store = useConnectionStore(); + store.connections = [{ id: "conn-1", name: "PostgreSQL", db_type: "postgres", database: "app" } as ConnectionConfig]; + store.sidebarLayout = { groups: [], order: [{ type: "connection", id: "conn-1" }] }; + + const queryTabLines = tabTooltipLines(queryTab({ connectionId: "conn-1", database: "app", schema: "public" }), translate); + expect(queryTabLines).toContainEqual({ label: "Schema:", value: "public" }); + + const dataTabLines = tabTooltipLines(queryTab({ connectionId: "conn-1", mode: "data", database: "app", tableMeta: { schema: "analytics", tableName: "events", columns: [], primaryKeys: [] } }), translate); + expect(dataTabLines).toContainEqual({ label: "Schema:", value: "analytics" }); + + const sameSchemaLines = tabTooltipLines(queryTab({ connectionId: "conn-1", database: "app", schema: "app" }), translate); + expect(sameSchemaLines.some((line) => line.label === "Schema:")).toBe(false); + }); + it("uses the live database and branch context for Dolt version control tabs", () => { const store = useConnectionStore(); store.connections = [{ id: "conn-1", name: "Production Dolt", db_type: "mysql", driver_profile: "dolt", database: "app" } as ConnectionConfig]; diff --git a/apps/desktop/src/lib/tabs/tabPresentation.ts b/apps/desktop/src/lib/tabs/tabPresentation.ts index 25ee5f452d..03b3a9f5dc 100644 --- a/apps/desktop/src/lib/tabs/tabPresentation.ts +++ b/apps/desktop/src/lib/tabs/tabPresentation.ts @@ -199,14 +199,24 @@ export function tabDisplayTitle(tab: QueryTab, t: Translate): string { } if (tab.mode === "data" && tab.tableMeta?.tableName) { if (compact) return tab.tableMeta.tableName; - const suffix = tab.tableMeta.schema && tab.tableMeta.schema !== tab.database ? `@${database}.${tab.tableMeta.schema}` : `@${database}`; + const schema = tab.tableMeta.schema || tab.schema; + const suffix = schema && schema !== tab.database ? `@${database}.${schema}` : `@${database}`; return `${tab.tableMeta.tableName}${suffix}`; } if (tab.mode === "query") { const title = queryTitle(tab); if (title) return title; if (compact) return connectionDisplayName(tab.connectionId); - return `${connectionDisplayName(tab.connectionId)}@${database}`; + const hasDatabase = Boolean(tab.database?.trim()); + const schema = tab.schema?.trim(); + let scope = database; + if (schema && schema !== tab.database) { + scope = hasDatabase ? `${database}.${schema}` : schema; + } + if (tab.catalog?.trim()) { + scope = `${tab.catalog.trim()}.${scope}`; + } + return `${connectionDisplayName(tab.connectionId)}@${scope}`; } if (tab.mode === "mongo" && tab.sql) { if (compact) return tab.sql; @@ -307,6 +317,10 @@ export function tabTooltipLines(tab: QueryTab, t: Translate): { label: string; v ...(groupName ? [{ label: t("tabs.tooltipGroup"), value: groupName }] : []), ...(showDatabase ? [{ label: t("tabs.tooltipDatabase"), value: databaseDisplayNameForTab(tab.connectionId, database, t) }] : []), ]; + const schema = tab.schema?.trim() || (tab.mode === "objects" ? tab.objectBrowser?.schema?.trim() : tab.tableMeta?.schema?.trim()); + if (schema && (tab.mode === "objects" || schema !== database)) { + lines.push({ label: t("tabs.tooltipSchema"), value: schema }); + } if (tab.mode === "query" && queryTitle(tab)) { lines.unshift({ label: t("tabs.tooltipTitle"), value: tab.title }); } @@ -336,9 +350,6 @@ export function tabTooltipLines(tab: QueryTab, t: Translate): { label: string; v if (tab.mode === "hbase" && tab.sql) { lines.push({ label: t("tabs.tooltipTable"), value: tab.sql }); } - if (tab.mode === "objects" && tab.objectBrowser?.schema) { - lines.push({ label: t("tabs.tooltipSchema"), value: tab.objectBrowser.schema }); - } return lines; }