fix(mysql): use database-specific catalog switching
This commit is contained in:
1 parent
9571519179
commit
2152f8cde8
31 files changed
+818
-182
No files matched your search
@@ -1525,9 +1525,14 @@ function changeActiveDatabase(database: string) {
|
||||
}
|
||||
}
|
||||
|
||||
function changeActiveCatalog(catalog: string | undefined, database: string) {
|
||||
const tab = activeTab.value;
|
||||
if (tab) queryStore.updateCatalog(tab.id, catalog, database);
|
||||
}
|
||||
|
||||
async function setActiveDatabaseAsDefault() {
|
||||
const tab = activeTab.value;
|
||||
if (!tab || !tab.connectionId || !tab.database) return;
|
||||
if (!tab || !tab.connectionId || !tab.database || tab.catalog) return;
|
||||
await connectionStore.setDefaultDatabase(tab.connectionId, tab.database);
|
||||
}
|
||||
|
||||
@@ -1557,9 +1562,11 @@ function ensureQueryTab(): string {
|
||||
const tab = activeTab.value;
|
||||
if (tab && tab.mode === "query") return tab.id;
|
||||
const connId = connectionStore.activeConnectionId || connectionStore.connections[0]?.id || "";
|
||||
const db = tab?.connectionId === connId ? tab.database : connectionStore.getConfig(connId)?.database || "";
|
||||
const schema = tab?.connectionId === connId ? tab.schema : undefined;
|
||||
return queryStore.createTab(connId, db, undefined, "query", schema);
|
||||
const sameConnectionTab = tab?.connectionId === connId ? tab : undefined;
|
||||
const db = sameConnectionTab?.database || connectionStore.getConfig(connId)?.database || "";
|
||||
const schema = sameConnectionTab?.schema ?? sameConnectionTab?.objectBrowser?.schema ?? sameConnectionTab?.tableMeta?.schema;
|
||||
const catalog = sameConnectionTab?.catalog ?? sameConnectionTab?.objectBrowser?.catalog ?? sameConnectionTab?.tableMeta?.catalog;
|
||||
return queryStore.createTab(connId, db, undefined, "query", schema, undefined, catalog);
|
||||
}
|
||||
|
||||
function routeAiRedisCommand(command: string, execute: boolean): boolean {
|
||||
@@ -2263,6 +2270,7 @@ onUnmounted(() => {
|
||||
@paste-sql-in-condition="pasteClipboardAsSqlInCondition"
|
||||
@change-connection="changeActiveConnection"
|
||||
@change-database="changeActiveDatabase"
|
||||
@change-catalog="changeActiveCatalog"
|
||||
@change-schema="changeActiveSchema"
|
||||
@set-default-database="setActiveDatabaseAsDefault"
|
||||
@clear-default-database="clearActiveDefaultDatabase"
|
||||
|
||||
Reference in new issue
Block a user