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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(kingbase): apply live mode to query parameters and batches (#12833)
Hand Sonicf1cac02678b5
diff --git a/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts b/apps/desktop/src/composables/__tests__/useSqlExecution.spec.tsindex 5174c5ad4e..fdcaf86e23 100644--- a/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts+++ b/apps/desktop/src/composables/__tests__/useSqlExecution.spec.ts@@ -141,6 +141,22 @@ describe("useSqlExecution", () => {vi.mocked(objectMetadataCache.invalidateObjectMetadataCache).mockClear();});+ it.each([+ ["pg", "SELECT data ? 'name' FROM events"],+ ["oracle", "SELECT 1 FROM DUAL@remote_db"],+ ["mysql", "CREATE PROCEDURE p() BEGIN label_1: LOOP LEAVE label_1; END LOOP; END"],+ ["sqlserver", "DECLARE @id int; SET @id = 1; SELECT @id;"],+ ])("does not mistake Kingbase %s server syntax for template parameters", async (mode, sql) => {+ const activeTab = ref<QueryTab | undefined>({ ...queryTab("app"), sql });+ const activeConnection = ref<ConnectionConfig | undefined>({ ...connection("kingbase"), database_info: { compatibilityMode: mode } });+ const execute = vi.spyOn(useQueryStore(), "executeCurrentSql").mockResolvedValue(undefined);+ vi.spyOn(useHistoryStore(), "add").mockResolvedValue(undefined);+ const execution = useSqlExecution({ activeTab: computed(() => activeTab.value), activeConnection: computed(() => activeConnection.value), executableSql: computed(() => sql), activeOutputView: ref("result") });+ await execution.tryExecute();+ expect(execution.showSqlParameterDialog.value).toBe(false);+ expect(execute).toHaveBeenCalledWith(sql, { tabId: "tab-1" });+ });+it("executes Neo4j graph patterns without a SQL parameter dialog", async () => {const sql = 'MATCH (p:Person)-[:WORK_IN]->(c:Company{name:"星云科技"})\nRETURN p.name, p.job, c.name';const activeTab = ref<QueryTab | undefined>({ ...queryTab("neo4j"), sql });diff --git a/apps/desktop/src/composables/__tests__/useSqlExecutionManualMultiDb.spec.ts b/apps/desktop/src/composables/__tests__/useSqlExecutionManualMultiDb.spec.tsindex 719038d6b8..4888856acb 100644--- a/apps/desktop/src/composables/__tests__/useSqlExecutionManualMultiDb.spec.ts+++ b/apps/desktop/src/composables/__tests__/useSqlExecutionManualMultiDb.spec.ts@@ -54,6 +54,20 @@ describe("manual multi-database submission", () => {vi.mocked(api.rollbackManualTransaction).mockResolvedValue({ columns: [], rows: [], affected_rows: 0, execution_time_ms: 0 });});+ it.each([+ ["oracle", "BEGIN\n NULL;\n NULL;\nEND;\n/\nSELECT 3;"],+ ["mysql", "DELIMITER $$\nCREATE PROCEDURE p() BEGIN SELECT 1; SELECT 2; END$$\nDELIMITER ;\nSELECT 3;"],+ ])("does not bypass the existing manual-transaction capability gate for Kingbase %s", async (mode, sql) => {+ const { execution, input, ordinary } = setup();+ input.connection.db_type = "kingbase";+ input.connection.database_info = { compatibilityMode: mode };+ input.sql = sql;+ const result = await execution.executeTargetSql(input);+ expect(result).toMatchObject({ status: "failed", errorMessage: "multiDbExecute.manualUnsupported" });+ expect(api.executeInManualTransaction).not.toHaveBeenCalled();+ expect(ordinary).not.toHaveBeenCalled();+ });+it("uses the captured target and records success only after an explicit commit", async () => {const { execution, input, ordinary, cleanup, capture, history } = setup();input.tab.resultCountSql = "SELECT COUNT(*) FROM unrelated_source";diff --git a/apps/desktop/src/composables/useSqlExecution.ts b/apps/desktop/src/composables/useSqlExecution.tsindex 283de66445..0278807b78 100644--- a/apps/desktop/src/composables/useSqlExecution.ts+++ b/apps/desktop/src/composables/useSqlExecution.ts@@ -31,7 +31,7 @@ import { useProductionSafetyStore } from "@/stores/productionSafetyStore";import type { SqlExecutionDangerRequest } from "@/stores/sqlExecutionDangerStore";import type { ConnectionConfig, DatabaseType, QueryResult, QueryTab } from "@/types/database";import type { MultiDbExecutionTarget, MultiDbResultRunExecution, MultiDbTargetExecutionResult, MultiDbManualTransaction } from "@/types/sqlExecution";-import { effectiveDatabaseTypeForConnection } from "@/lib/database/jdbcDialect";+import { effectiveDatabaseTypeForConnection, kingbaseSqlDatabaseType } from "@/lib/database/jdbcDialect";import type { SqlExecutionTargetContext } from "@/lib/database/sqlExecutionTargetRegistry";import { MULTI_SOURCE_MAX_ROWS_PER_SOURCE } from "@/lib/query/multiSourceResult";import { translateBackendError } from "@/i18n/backend-errors";@@ -246,7 +246,7 @@ export function useSqlExecution(deps: {async function resolvedExecutableSql(source: SqlExecutionOverride | undefined, context: SqlExecutionContext): Promise<{ sql: string; sourceOffset?: number; editorViewportRequestId?: number }> {const atSetEnabled = resolveSqlVariableSyntaxToggles(settingsStore.editorSettings.sqlVariableSyntaxOverrides, context.connection?.db_type, settingsStore.editorSettings.sqlVariableSubstitutionEnabled).atSet;- const databaseType = effectiveDatabaseTypeForConnection(context.connection) ?? context.connection?.db_type;+ const databaseType = kingbaseSqlDatabaseType(context.connection) ?? effectiveDatabaseTypeForConnection(context.connection) ?? context.connection?.db_type;const expand = (sql: string, declarationSql?: string) => (atSetEnabled ? expandSqlVariables(sql, { declarationSql, databaseType }).sql : sql);if (typeof source === "string") return { sql: expand(source) };@@ -412,13 +412,14 @@ export function useSqlExecution(deps: {const databaseType = effectiveDatabaseTypeForConnection(connection) ?? connection?.db_type;const toggles = resolveSqlVariableSyntaxToggles(settingsStore.editorSettings.sqlVariableSyntaxOverrides, databaseType, settingsStore.editorSettings.sqlVariableSubstitutionEnabled);const enabledSyntaxes = enabledSqlParameterSyntaxes(toggles);- const parameters = extractSqlParameterDescriptors(sql, { databaseType, enabledSyntaxes });+ const parameterDatabaseType = kingbaseSqlDatabaseType(connection) ?? databaseType;+ const parameters = extractSqlParameterDescriptors(sql, { databaseType: parameterDatabaseType, enabledSyntaxes });if (!parameters.length) {return false;}sqlParameterSourceSql.value = sql;sqlParameterNames.value = parameters;- sqlParameterDatabaseType.value = databaseType;+ sqlParameterDatabaseType.value = parameterDatabaseType;sqlParameterEnabledSyntaxes.value = enabledSyntaxes;pendingSourceOffset.value = sourceOffset;pendingOpenInNewResultTab.value = options.openInNewResultTab === true;@@ -485,7 +486,11 @@ export function useSqlExecution(deps: {cancelEditorViewportRequest(options.editorViewportRequestId);return notStarted("missing-database", executionTabId);}- const statementCount = splitSqlStatementRanges(sql, executionDatabaseType, sqlStatementParameterOptionsForCompatibility(executionDatabaseType, executionDatabaseType === "opengauss" ? connectionStore.databaseCompatibilityMode(tab.connectionId, tab.database) : undefined)).length;+ const statementCount = splitSqlStatementRanges(+ sql,+ executionDatabaseType,+ sqlStatementParameterOptionsForCompatibility(executionDatabaseType, executionDatabaseType === "opengauss" ? connectionStore.databaseCompatibilityMode(tab.connectionId, tab.database) : executionDatabaseType === "kingbase" ? executionConnection?.database_info?.compatibilityMode : undefined),+ ).length;const redisConsoleSelected = executionDatabaseType === "redis" && tab.uiState?.redisResultViewMode === "console";// Output-view switching belongs to the tab the user is looking at — both// when the query starts and when it finishes.@@ -782,7 +787,7 @@ export function useSqlExecution(deps: {// expired-session replay, or per-statement retry is allowed for this batch.const maxRows = agentProtocolQueryResultMaxRows(effectiveQueryResultMaxRows(settingsStore.editorSettings.queryResultMaxRowsEnabled, settingsStore.editorSettings.queryResultMaxRows));const databaseType = effectiveDatabaseTypeForConnection(connection);- const compatibility = databaseType === "opengauss" ? connectionStore.databaseCompatibilityMode(executionTab.connectionId, executionTab.database) : undefined;+ const compatibility = databaseType === "opengauss" ? connectionStore.databaseCompatibilityMode(executionTab.connectionId, executionTab.database) : databaseType === "kingbase" ? connection?.database_info?.compatibilityMode : undefined;const statements = splitSqlStatementRanges(sql, databaseType, sqlStatementParameterOptionsForCompatibility(databaseType, compatibility));const results: NonNullable<QueryTab["results"]> = [];for (const [statementIndex, statement] of (statements.length ? statements : [{ sql, from: 0, to: sql.length }]).entries()) {diff --git a/apps/desktop/src/lib/database/jdbcDialect.ts b/apps/desktop/src/lib/database/jdbcDialect.tsindex a274453f96..8c36534c5a 100644--- a/apps/desktop/src/lib/database/jdbcDialect.ts+++ b/apps/desktop/src/lib/database/jdbcDialect.ts@@ -247,6 +247,24 @@ export function sqlSnippetDatabaseTypeForConnection(connection?: JdbcDialectConnreturn effectiveDatabaseTypeForConnection(connection);}+/** SQL syntax only: never use this mapping for transport, catalogs or capabilities. */+export function kingbaseSqlDatabaseType(connection?: JdbcDialectConnection): "mysql" | "postgres" | "oracle" | "sqlserver" | undefined {+ if (connection?.db_type !== "kingbase") return undefined;+ const mode = connection.database_info?.compatibilityMode?.trim().toLowerCase();+ switch (mode) {+ case "pg":+ case "postgres":+ case "postgresql":+ return "postgres";+ case "oracle":+ case "mysql":+ case "sqlserver":+ return mode;+ default:+ return undefined;+ }+}+export function tableStructureDatabaseTypeForConnection(connection?: JdbcDialectConnection): DatabaseType | undefined {if (!connection) return undefined;if (connection.db_type === "gbase") return "gbase";diff --git a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.tsindex c861a3a0f4..39f5823e88 100644--- a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts+++ b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts@@ -113,6 +113,26 @@ function structuredSqlError(detail = "duplicate key") {}describe("queryStore multi-statement errors", () => {+ it.each([+ ["oracle", "BEGIN\n NULL;\n NULL;\nEND;\n/\nSELECT 3;"],+ ["mysql", "DELIMITER $$\nCREATE PROCEDURE p() BEGIN SELECT 1; SELECT 2; END$$\nDELIMITER ;\nSELECT 3;"],+ ["pg", "CREATE FUNCTION f() RETURNS int AS $$ BEGIN RETURN 1; END; $$ LANGUAGE plpgsql; SELECT 3;"],+ ["sqlserver", "SELECT [a;b] FROM #temp;\nGO\nSELECT 3;"],+ ])("preserves Kingbase %s batch boundaries from the connection metadata", async (mode, sql) => {+ mocks.getConnectionConfig.mockReturnValue({ id: "kingbase-1", db_type: "kingbase", database: "app", database_info: { compatibilityMode: mode } });+ mocks.executeMulti.mockResolvedValue([+ { columns: [], rows: [], affected_rows: 0, execution_time_ms: 1 },+ { columns: ["value"], rows: [[3]], affected_rows: 0, execution_time_ms: 1 },+ ]);+ const { useQueryStore } = await import("@/stores/queryStore");+ const store = useQueryStore();+ const tabId = store.createTab("kingbase-1", "app", "Query");+ await store.executeTabSql(tabId, sql);+ const batch = store.tabs.find((item) => item.id === tabId)!.batchSqlExecution;+ expect(batch?.items).toHaveLength(2);+ expect(batch?.items[1].sql).toBe("SELECT 3");+ });+it.each(["oracle", "oceanbase-oracle"])("preserves the intended offset timing scope for %s", async (dbType) => {mocks.getConnectionConfig.mockReturnValue({ id: "timing-offset", name: "Timing", db_type: dbType, database: "APP", query_timeout_secs: 30 });mocks.analyzeEditableQueryEditability.mockResolvedValue({ editable: false, reason: "complex-query" });diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.tsindex 4b91e48c6a..1a25584cce 100644--- a/apps/desktop/src/stores/queryStore.ts+++ b/apps/desktop/src/stores/queryStore.ts@@ -7845,7 +7845,10 @@ export const useQueryStore = defineStore("query", () => {}const targetSchema = resumedExecutionTarget ? resumedExecutionTarget.schema : targetContext?.scope === "connection" ? undefined : (databaseTargetContext?.schema ?? executionTarget?.schema ?? tab.schema);const executionDatabase = targetDatabase;- const sqlStatementParameterOptions = sqlStatementParameterOptionsForCompatibility(effectiveDbType, effectiveDbType === "opengauss" ? connStore.databaseCompatibilityMode(executionConnectionId, targetDatabase || conn?.database) : undefined);+ const sqlStatementParameterOptions = sqlStatementParameterOptionsForCompatibility(+ effectiveDbType,+ effectiveDbType === "opengauss" ? connStore.databaseCompatibilityMode(executionConnectionId, targetDatabase || conn?.database) : effectiveDbType === "kingbase" ? conn?.database_info?.compatibilityMode : undefined,+ );const useAgentCursor = usesAgentCursorForQuery(conn?.db_type, conn?.driver_profile);const queryTimeoutSecs = queryTimeoutSecsForConnection(conn, settingsStore.editorSettings.globalQueryTimeoutSecs);if (!batchResume) {