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(grid): keep large values intact when refreshing saved rows
Loc Nguyend99e5d8b26cc
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vueindex 4820001b13..62d73b0d93 100644--- a/apps/desktop/src/components/grid/DataGrid.vue+++ b/apps/desktop/src/components/grid/DataGrid.vue@@ -274,7 +274,7 @@ import { resolveCrosshairTarget, type CrosshairTarget } from "@/lib/dataGrid/croimport { DATA_GRID_DARK_NEW_ROW_BG, DATA_GRID_DARK_STRIPED_ROW_BG, DATA_GRID_LIGHT_NEW_ROW_BG, DATA_GRID_LIGHT_STRIPED_ROW_BG, dataGridActiveRowBackground } from "@/lib/dataGrid/dataGridPaintTheme";import { createRowLowerTextCache } from "@/lib/dataGrid/dataGridRowLowerText";import { dataGridPreviewLabelKey, dataGridSaveActionMode, dataGridSaveToolbarState } from "@/lib/dataGrid/dataGridSaveUi";-import { buildDataGridSavedRowRefreshPlan, dataGridSavedRowRefreshPatches } from "@/lib/dataGrid/dataGridSavedRowRefresh";+import { buildDataGridSavedRowRefreshPlan, dataGridSavedRowRefreshPatches, executeDataGridSavedRowRefreshQuery } from "@/lib/dataGrid/dataGridSavedRowRefresh";import type { QueryEditabilityReason } from "@/lib/sql/sqlAnalysis";import { sqlWithoutCommentsForCopy } from "@/lib/sql/sqlWithoutCommentsForCopy";import { productionContextForDatabase } from "@/lib/database/productionSafety";@@ -4450,6 +4450,7 @@ async function refreshSavedRows(request: { dirtyRows: ReadonlyMap<number, ReadonidentityConditions.push(`(${conditions.join(" AND ")})`);}+ const largeValuePreviewOptions = tableDataLargeValuePreviewOptions(resolvedDatabaseType.value, tableMeta.columns, tableMeta.primaryKeys, pageSize.value);const sql = await buildTableSelectSql({databaseType: resolvedDatabaseType.value,driverProfile: connectionStore.getConfig(connectionId)?.driver_profile,@@ -4463,16 +4464,21 @@ async function refreshSavedRows(request: { dirtyRows: ReadonlyMap<number, Readoncolumns: tableMeta.columns.map((column) => column.name),includeDatabaseName: settingsStore.editorSettings.generateSqlIncludeDatabaseName,primaryKeys: tableMeta.primaryKeys,- ...tableDataLargeValuePreviewOptions(resolvedDatabaseType.value, tableMeta.columns, tableMeta.primaryKeys, pageSize.value),+ ...largeValuePreviewOptions,whereInput: identityConditions.join(" OR "),limit: planResult.plan.sourceIndexes.length + 1,includeRowId: shouldIncludeSyntheticRowId(resolvedDatabaseType.value, tableMeta.primaryKeys, tableMeta.tableType),});- const refreshed = await api.executeQuery(connectionId, props.executionDatabase ?? props.database ?? "", sql, tableMeta.schema ?? props.schema, undefined, {- maxRows: planResult.plan.sourceIndexes.length + 1,- fetchSize: planResult.plan.sourceIndexes.length + 1,- pageSize: planResult.plan.sourceIndexes.length + 1,+ const refreshed = await executeDataGridSavedRowRefreshQuery(api, {+ connectionId,+ database: props.executionDatabase ?? props.database ?? "",+ schema: tableMeta.schema ?? props.schema,+ sql,+ rowLimit: planResult.plan.sourceIndexes.length + 1,+ primaryKeys: tableMeta.primaryKeys,+ largeValuePreview: "largeValuePreviewSize" in largeValuePreviewOptions,});+ if (!refreshed) return false;const patches = dataGridSavedRowRefreshPatches(planResult.plan, request.columns, props.sourceColumns, refreshed.columns, refreshed.rows);if (!patches) return false;diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridSavedRowRefresh.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridSavedRowRefresh.spec.tsindex 3fc76f9d61..20730850c7 100644--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridSavedRowRefresh.spec.ts+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridSavedRowRefresh.spec.ts@@ -1,5 +1,6 @@-import { describe, expect, it } from "vitest";-import { buildDataGridSavedRowRefreshPlan, dataGridSavedRowRefreshPatches } from "@/lib/dataGrid/dataGridSavedRowRefresh";+import { describe, expect, it, vi } from "vitest";+import { buildDataGridSavedRowRefreshPlan, dataGridSavedRowRefreshPatches, executeDataGridSavedRowRefreshQuery } from "@/lib/dataGrid/dataGridSavedRowRefresh";+import type { QueryResult } from "@/types/database";function dirtyRows(...entries: Array<[number, Array<[number, string | number | boolean | null]>]>): Map<number, Map<number, string | number | boolean | null>> {return new Map(entries.map(([rowIndex, changes]) => [rowIndex, new Map(changes)]));@@ -117,3 +118,37 @@ describe("dataGridSavedRowRefresh", () => {).toBeNull();});});++describe("executeDataGridSavedRowRefreshQuery", () => {+ const query = { connectionId: "c1", database: "cloudbook", schema: undefined, sql: "SELECT ...", rowLimit: 2, primaryKeys: ["id"] };++ function result(overrides: Partial<QueryResult> = {}): QueryResult {+ return { columns: ["id", "def_json"], rows: [[16, "{"]], affected_rows: 0, execution_time_ms: 1, ...overrides };+ }++ it("runs large-value preview SQL as a table-data preview so markers become large_value_cells", async () => {+ const preview = result({ large_value_cells: [{ row_index: 0, column_index: 1, original_bytes: 21814 }] });+ const runner = { executeQuery: vi.fn(), executeMulti: vi.fn().mockResolvedValue([preview]) };++ await expect(executeDataGridSavedRowRefreshQuery(runner, { ...query, largeValuePreview: true })).resolves.toBe(preview);+ expect(runner.executeQuery).not.toHaveBeenCalled();+ expect(runner.executeMulti).toHaveBeenCalledWith("c1", "cloudbook", "SELECT ...", undefined, undefined, { maxRows: 2, fetchSize: 2, pageSize: 2, resultKeyColumns: ["id"], tableDataPreview: true });+ });++ it("keeps the plain query path when no preview columns were requested", async () => {+ const plain = result();+ const runner = { executeQuery: vi.fn().mockResolvedValue(plain), executeMulti: vi.fn() };++ await expect(executeDataGridSavedRowRefreshQuery(runner, { ...query, largeValuePreview: false })).resolves.toBe(plain);+ expect(runner.executeMulti).not.toHaveBeenCalled();+ expect(runner.executeQuery).toHaveBeenCalledWith("c1", "cloudbook", "SELECT ...", undefined, undefined, { maxRows: 2, fetchSize: 2, pageSize: 2 });+ });++ it("returns null for a failed or empty preview execution so the grid reloads instead", async () => {+ const failing = { executeQuery: vi.fn(), executeMulti: vi.fn().mockResolvedValue([result({ execution_error: true })]) };+ const empty = { executeQuery: vi.fn(), executeMulti: vi.fn().mockResolvedValue([]) };++ await expect(executeDataGridSavedRowRefreshQuery(failing, { ...query, largeValuePreview: true })).resolves.toBeNull();+ await expect(executeDataGridSavedRowRefreshQuery(empty, { ...query, largeValuePreview: true })).resolves.toBeNull();+ });+});diff --git a/apps/desktop/src/lib/dataGrid/dataGridSavedRowRefresh.ts b/apps/desktop/src/lib/dataGrid/dataGridSavedRowRefresh.tsindex 84f295637f..91b73a26e4 100644--- a/apps/desktop/src/lib/dataGrid/dataGridSavedRowRefresh.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridSavedRowRefresh.ts@@ -1,4 +1,5 @@import type { CellValue } from "@/lib/dataGrid/cellValue";+import type { QueryResult } from "@/types/database";export const DATA_GRID_SAVED_ROW_REFRESH_LIMIT = 100;@@ -136,3 +137,32 @@ export function dataGridSavedRowRefreshPatches(plan: DataGridSavedRowRefreshPlan}return patches;}++export interface DataGridSavedRowRefreshQuery {+ connectionId: string;+ database: string;+ schema?: string;+ sql: string;+ rowLimit: number;+ primaryKeys: readonly string[];+ /** The SQL was built with large-value preview options (truncated cells plus marker columns). */+ largeValuePreview: boolean;+}++export interface DataGridSavedRowRefreshRunner {+ executeQuery: (connectionId: string, database: string, sql: string, schema?: string, executionId?: string, options?: { maxRows?: number; fetchSize?: number; pageSize?: number }) => Promise<QueryResult>;+ executeMulti: (connectionId: string, database: string, sql: string, schema?: string, executionId?: string, options?: { maxRows?: number; fetchSize?: number; pageSize?: number; resultKeyColumns?: string[]; tableDataPreview?: boolean }) => Promise<QueryResult[]>;+}++/**+ * Preview SQL truncates large values and adds marker columns; only a table-data+ * preview execution turns those markers into `large_value_cells`. A plain query+ * would hand back the truncated preview as the cell's full value (issue #12504).+ */+export async function executeDataGridSavedRowRefreshQuery(runner: DataGridSavedRowRefreshRunner, query: DataGridSavedRowRefreshQuery): Promise<QueryResult | null> {+ const limits = { maxRows: query.rowLimit, fetchSize: query.rowLimit, pageSize: query.rowLimit };+ const refreshed = query.largeValuePreview+ ? (await runner.executeMulti(query.connectionId, query.database, query.sql, query.schema, undefined, { ...limits, resultKeyColumns: [...query.primaryKeys], tableDataPreview: true }))[0]+ : await runner.executeQuery(query.connectionId, query.database, query.sql, query.schema, undefined, limits);+ return refreshed && !refreshed.execution_error ? refreshed : null;+}