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(doris): use catalog database for external catalog queries

Melody Rucha35ceb754ee9
diff --git a/apps/desktop/src/stores/__tests__/queryStore.tableDataRefresh.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.tableDataRefresh.spec.ts
index e7db2b5941..6fcbc1c7df 100644
--- a/apps/desktop/src/stores/__tests__/queryStore.tableDataRefresh.spec.ts
+++ b/apps/desktop/src/stores/__tests__/queryStore.tableDataRefresh.spec.ts
@@ -179,6 +179,33 @@ describe("queryStore table data refresh", () => {
expect(mocks.executeMulti).toHaveBeenCalledWith("cache-1", "USER", 'SELECT * FROM "SS"."SS_User" ORDER BY "ID" ASC', undefined, expect.any(String), expect.objectContaining({ maxRows: 100, fetchSize: 100, rowOffset: 100 }));
});
+ it("executes Doris external catalog data tabs against the catalog database, not the connection default database", async () => {
+ mocks.getConnectionConfig.mockReturnValue({
+ id: "doris-1",
+ name: "Doris",
+ db_type: "doris",
+ database: "yunye",
+ query_timeout_secs: 30,
+ });
+ mocks.buildTableSelectSql.mockResolvedValue("SELECT * FROM `ice`.`mydb`.`tt2` LIMIT 100");
+ const { useQueryStore } = await import("@/stores/queryStore");
+ const store = useQueryStore();
+ const tabId = store.createTab("doris-1", "mydb", "tt2", "data", undefined, undefined, "ice");
+ store.setTableMeta(tabId, {
+ catalog: "ice",
+ tableName: "tt2",
+ tableType: "TABLE",
+ columns: [{ name: "id", data_type: "int", is_nullable: true, column_default: null, is_primary_key: false, extra: null }],
+ primaryKeys: [],
+ });
+
+ await store.refreshDataTab(tabId);
+
+ // The backend switches catalog first and then runs USE <database>, so the
+ // connection's internal default database ("yunye") would fail with 1049.
+ expect(mocks.executeMulti).toHaveBeenCalledWith("doris-1", "mydb", "SELECT * FROM `ice`.`mydb`.`tt2` LIMIT 100", undefined, expect.any(String), expect.objectContaining({ catalog: "ice" }));
+ });
+
it("refreshes one targeted tab while preserving its query context", async () => {
const { useQueryStore } = await import("@/stores/queryStore");
const store = useQueryStore();
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index add358969d..319e547e5e 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -50,7 +50,6 @@ import { canInsertTableRows, canUseKeylessRowPredicate, DBX_ROWID_COLUMN, editab
import { TABLE_DATA_EXPORT_PAGE_SIZE } from "@/lib/table/tableDataExport";
import { tableMetaForDataTab } from "@/lib/table/tableDataTabMeta";
import { isDataTabMetadataLifecycleStale } from "@/lib/sidebar/dataTabOpenPolicy";
-import { dataTabExecutionDatabase } from "@/lib/table/dataTabExecutionDatabase";
import type { SqlInsertMode } from "@/lib/export/sqlInsertMode";
import { tableOpenPageLimit } from "@/lib/table/tableOpenPageLimit";
import { getCachedTableMetadata, loadTableColumns, loadTableIndexes, loadTableMetadata, tableMetadataToDataTabMeta, updateCachedTableMetadataType, type TableMetadataRequest } from "@/lib/metadata/tableMetadataCache";
@@ -1438,10 +1437,8 @@ export const useQueryStore = defineStore("query", () => {
const transferredResultSessionId = worker?.resultSessionId && tabs.value.some((tab) => tab.resultRuns?.some((run) => run.resultSessionId === worker.resultSessionId)) ? worker.resultSessionId : undefined;
await closeResultSession(worker, transferredResultSessionId);
if (transferredResultSessionId && worker) {
- const connection = useConnectionStore().getConfig(worker.connectionId);
- const executionDatabase = dataTabExecutionDatabase(connection, worker.database, worker.catalog);
for (const suffix of BACKGROUND_CLIENT_SESSION_SUFFIXES) {
- await closeClientSessionId(worker.connectionId, executionDatabase, tabClientSessionId(worker, suffix), worker.catalog, { tabId: worker.id });
+ await closeClientSessionId(worker.connectionId, worker.database, tabClientSessionId(worker, suffix), worker.catalog, { tabId: worker.id });
}
} else {
await closeClientConnectionSession(worker);
@@ -1487,12 +1484,10 @@ export const useQueryStore = defineStore("query", () => {
const resultClientSessionId = tab.resultClientSessionId;
const catalog = tab.mode === "data" ? tab.tableMeta?.catalog : tab.catalog;
const location = tab.mode === "query" ? queryResultExecutionLocation(tab) : { connectionId: tab.connectionId, database: tab.database, catalog };
- const connection = location.catalog ? useConnectionStore().getConfig(location.connectionId) : undefined;
- const executionDatabase = dataTabExecutionDatabase(connection, location.database, location.catalog);
try {
const clientSessionId = tab.resultClientSessionId ?? tab.id;
- if (location.catalog) await api.closeQuerySession(location.connectionId, executionDatabase, sessionId, clientSessionId, location.catalog);
- else await api.closeQuerySession(location.connectionId, executionDatabase, sessionId, clientSessionId);
+ if (location.catalog) await api.closeQuerySession(location.connectionId, location.database, sessionId, clientSessionId, location.catalog);
+ else await api.closeQuerySession(location.connectionId, location.database, sessionId, clientSessionId);
} catch (error) {
console.warn("[DBX][query-session:close:error]", { tabId: tab.id, sessionId, error });
if (throwOnError) throw error;
@@ -1505,7 +1500,7 @@ export const useQueryStore = defineStore("query", () => {
invalidateResultEstimateForPayload(tab.result);
}
if (resultClientSessionId && resultClientSessionId !== tab.id) {
- await closeClientSessionId(location.connectionId, executionDatabase, resultClientSessionId, location.catalog, { tabId: tab.id }, throwOnError);
+ await closeClientSessionId(location.connectionId, location.database, resultClientSessionId, location.catalog, { tabId: tab.id }, throwOnError);
}
}
}
@@ -1523,11 +1518,9 @@ export const useQueryStore = defineStore("query", () => {
async function closeClientConnectionSession(tab: QueryTab | undefined, throwOnError = false) {
if (!tab?.connectionId) return;
const catalog = tab.mode === "data" ? tab.tableMeta?.catalog : tab.catalog;
- const connection = catalog ? useConnectionStore().getConfig(tab.connectionId) : undefined;
- const executionDatabase = dataTabExecutionDatabase(connection, tab.database, catalog);
const clientSessionIds = [...new Set([tabClientSessionId(tab), ...BACKGROUND_CLIENT_SESSION_SUFFIXES.map((suffix) => tabClientSessionId(tab, suffix)), tab.explainClientSessionId].filter((sessionId): sessionId is string => !!sessionId))];
for (const clientSessionId of clientSessionIds) {
- await closeClientSessionId(tab.connectionId, executionDatabase, clientSessionId, catalog, { tabId: tab.id }, throwOnError);
+ await closeClientSessionId(tab.connectionId, tab.database, clientSessionId, catalog, { tabId: tab.id }, throwOnError);
}
}
@@ -6488,7 +6481,7 @@ export const useQueryStore = defineStore("query", () => {
await connStore.ensureDatabaseCompatibilityMode(executionConnectionId, targetDatabase || conn?.database);
}
const targetSchema = resumedExecutionTarget ? resumedExecutionTarget.schema : targetContext?.scope === "connection" ? undefined : (databaseTargetContext?.schema ?? executionTarget?.schema ?? tab.schema);
- const executionDatabase = dataTabExecutionDatabase(conn, targetDatabase, executionCatalog);
+ const executionDatabase = targetDatabase;
const sqlStatementParameterOptions = sqlStatementParameterOptionsForCompatibility(effectiveDbType, effectiveDbType === "opengauss" ? connStore.databaseCompatibilityMode(executionConnectionId, targetDatabase || conn?.database) : undefined);
const useAgentCursor = usesAgentCursorForQuery(conn?.db_type, conn?.driver_profile);
const queryTimeoutSecs = queryTimeoutSecsForConnection(conn, settingsStore.editorSettings.globalQueryTimeoutSecs);
@@ -8234,7 +8227,7 @@ export const useQueryStore = defineStore("query", () => {
if (tab.mode === "query" && sourceStatement && splitMongoCommandRanges(sourceStatement).length === 0) {
const metadataStartedAt = performance.now();
const connection = useConnectionStore().getConfig(tab.connectionId);
- const executionDatabase = dataTabExecutionDatabase(connection, tab.database, tab.catalog);
+ const executionDatabase = tab.database;
analyzeQueryMetadataInBackground(id, sourceStatement, tab.result, executionDatabase, uuid().slice(0, 8), () => `${Math.round(performance.now() - metadataStartedAt)}ms`, effectiveDatabaseTypeForConnection(connection), [], connection);
}
}
@@ -8495,7 +8488,7 @@ export const useQueryStore = defineStore("query", () => {
const sortOrder = tab.resultSortColumn && tab.resultSortDirection ? `${quoteTableDataIdentifier(effectiveDbType, tab.resultSortColumn, identifierQuote)} ${tab.resultSortDirection.toUpperCase()}` : undefined;
const orderBy = tab.orderByInput?.trim() || sortOrder;
const queryTimeoutSecs = queryTimeoutSecsForConnection(conn, settingsStore.editorSettings.globalQueryTimeoutSecs);
- const executionDatabase = dataTabExecutionDatabase(conn, tab.database, tableMeta.catalog);
+ const executionDatabase = tab.database;
const rows: QueryResult["rows"] = [];
let columns: string[] = [];
let executionTimeMs = 0;
@@ -8584,7 +8577,7 @@ export const useQueryStore = defineStore("query", () => {
const conn = connStore.getConfig(location.connectionId);
const effectiveDbType = effectiveDatabaseTypeForConnection(conn);
const executableSql = effectiveDbType === "mysql" ? stripMysqlClientDisplayCommand(sql) : sql;
- const executionDatabase = dataTabExecutionDatabase(conn, location.database, location.catalog);
+ const executionDatabase = location.database;
// main 引入全局查询超时:queryTimeoutSecsForConnection 现需传入全局默认值;
// settingsStore 取 defineStore 顶层声明的实例(本函数无局部覆盖)。
const queryTimeoutSecs = queryTimeoutSecsForConnection(conn, settingsStore.editorSettings.globalQueryTimeoutSecs);
@@ -8710,8 +8703,8 @@ export const useQueryStore = defineStore("query", () => {
offset += result.rows.length;
}
} finally {
- if (sessionId) void api.closeQuerySession(location.connectionId, executionDatabase, sessionId, clientSessionId, location.catalog);
- void closeClientSessionId(location.connectionId, executionDatabase, clientSessionId, location.catalog, { tabId: tab.id });
+ if (sessionId) void api.closeQuerySession(location.connectionId, location.database, sessionId, clientSessionId, location.catalog);
+ void closeClientSessionId(location.connectionId, location.database, clientSessionId, location.catalog, { tabId: tab.id });
}
return {
@@ -8753,7 +8746,7 @@ export const useQueryStore = defineStore("query", () => {
return {
exportId: options.exportId,
connectionId: location.connectionId,
- database: dataTabExecutionDatabase(conn, location.database, location.catalog),
+ database: location.database,
schema: location.schema,
catalog: location.catalog,
sql: executableSql,