fix(mysql): preserve column aliases in multi-table INSERT export

This commit is contained in:
zipg authored and GitHub committed 2026-07-24 23:50:23 +08:00
1 parent 85b6afd3c1
commit 26ea0a7a28
2 files changed
+74 -6

No files matched your search

@@ -1503,7 +1503,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
columnTypes?: Array<string | undefined>; columnTypes?: Array<string | undefined>;
rows: CellValue[][]; rows: CellValue[][];
} { } {
const exportColumns = tableMeta.value ? effectiveColumns(sourceColumns.value, result.columns) : result.columns; const exportColumns = context.value === "table-data" && tableMeta.value ? effectiveColumns(sourceColumns.value, result.columns) : result.columns;
const columnIndexes = exportColumns.map((column, index) => ({ column, index })).filter((item): item is { column: string; index: number } => !!item.column); const columnIndexes = exportColumns.map((column, index) => ({ column, index })).filter((item): item is { column: string; index: number } => !!item.column);
const exportColumnTypes = columnTypes.value?.length === result.columns.length ? columnTypes.value : undefined; const exportColumnTypes = columnTypes.value?.length === result.columns.length ? columnTypes.value : undefined;
return { return {
+73 -5
View File
@@ -3,7 +3,8 @@ import { computed, ref } from "vue";
import { beforeEach, test, vi } from "vitest"; import { beforeEach, test, vi } from "vitest";
import { createPinia, setActivePinia } from "pinia"; import { createPinia, setActivePinia } from "pinia";
import { useSettingsStore } from "../../apps/desktop/src/stores/settingsStore.ts"; import { useSettingsStore } from "../../apps/desktop/src/stores/settingsStore.ts";
import type { QueryResult } from "../../apps/desktop/src/types/database.ts"; import type { DataGridTableMeta } from "../../apps/desktop/src/lib/dataGrid/dataGridSql.ts";
import type { DatabaseType, QueryResult } from "../../apps/desktop/src/types/database.ts";
const apiMock = vi.hoisted(() => ({ const apiMock = vi.hoisted(() => ({
startQueryResultExport: vi.fn(), startQueryResultExport: vi.fn(),
@@ -17,6 +18,7 @@ const apiMock = vi.hoisted(() => ({
exportQueryResultMarkdown: vi.fn(), exportQueryResultMarkdown: vi.fn(),
exportQueryResultsXlsx: vi.fn(), exportQueryResultsXlsx: vi.fn(),
buildDataGridCopyInsertStatement: vi.fn(), buildDataGridCopyInsertStatement: vi.fn(),
buildExportSqlInsert: vi.fn(),
})); }));
const clipboardMock = vi.hoisted(() => ({ const clipboardMock = vi.hoisted(() => ({
copyToClipboard: vi.fn(), copyToClipboard: vi.fn(),
@@ -80,6 +82,10 @@ function buildExportHarness(
rows?: QueryResult["rows"]; rows?: QueryResult["rows"];
allExportResults?: Array<{ sheetName: string; result: QueryResult; sql?: string }>; allExportResults?: Array<{ sheetName: string; result: QueryResult; sql?: string }>;
completeLocalResult?: QueryResult; completeLocalResult?: QueryResult;
tableMeta?: DataGridTableMeta;
sourceColumns?: Array<string | undefined>;
databaseType?: DatabaseType;
context?: "results" | "table-data";
} = {}, } = {},
) { ) {
const exportColumns = options.columns ?? ["id", "name"]; const exportColumns = options.columns ?? ["id", "name"];
@@ -129,12 +135,12 @@ function buildExportHarness(
displayItems: computed(() => rowItems), displayItems: computed(() => rowItems),
sql: computed(() => "SELECT * FROM users"), sql: computed(() => "SELECT * FROM users"),
exportSql: computed(() => "SELECT * FROM users ORDER BY id DESC"), exportSql: computed(() => "SELECT * FROM users ORDER BY id DESC"),
tableMeta: computed(() => undefined), tableMeta: computed(() => options.tableMeta),
databaseType: computed(() => "postgres"), databaseType: computed(() => options.databaseType ?? "postgres"),
connectionId: computed(() => "conn-1"), connectionId: computed(() => "conn-1"),
database: computed(() => "db"), database: computed(() => "db"),
context: computed(() => "results"), context: computed(() => options.context ?? "results"),
sourceColumns: computed(() => undefined), sourceColumns: computed(() => options.sourceColumns),
columnTypes: computed(() => options.columnTypes), columnTypes: computed(() => options.columnTypes),
whereInput: computed(() => undefined), whereInput: computed(() => undefined),
orderBy: computed(() => undefined), orderBy: computed(() => undefined),
@@ -717,6 +723,68 @@ test("complete local query result XLSX export does not re-execute the query", as
assert.deepEqual(apiMock.exportQueryResultXlsx.mock.calls[0]?.slice(1), ["Export", ["id", "name"], ["int4", "text"], completeLocalResult.rows]); assert.deepEqual(apiMock.exportQueryResultXlsx.mock.calls[0]?.slice(1), ["Export", ["id", "name"], ["int4", "text"], completeLocalResult.rows]);
}); });
test("MySQL joined query SQL export keeps result aliases instead of source column names", async () => {
const download = installTextDownloadCapture();
const completeLocalResult: QueryResult = {
columns: ["order_no", "customer_name", "total_amount"],
column_types: ["int", "varchar", "decimal"],
rows: [[101, "Ada", "25.50"]],
affected_rows: 0,
execution_time_ms: 1,
truncated: false,
has_more: false,
};
apiMock.buildExportSqlInsert.mockResolvedValueOnce("INSERT INTO `orders` (`order_no`, `customer_name`, `total_amount`) VALUES (101, 'Ada', 25.50);");
try {
const { composable } = buildExportHarness({
columns: completeLocalResult.columns,
rows: completeLocalResult.rows,
completeLocalResult,
databaseType: "mysql",
tableMeta: {
tableName: "orders",
primaryKeys: ["id"],
},
sourceColumns: ["id", undefined, "amount"],
});
await composable.exportSql();
assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].columns, ["order_no", "customer_name", "total_amount"]);
assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].rows, [[101, "Ada", "25.50"]]);
assert.match((await download.content()) ?? "", /`order_no`, `customer_name`, `total_amount`/);
} finally {
download.restore();
}
});
test("table data SQL export keeps source column names", async () => {
const download = installTextDownloadCapture();
apiMock.buildExportSqlInsert.mockResolvedValueOnce("INSERT INTO `users` (`id`, `name`) VALUES (1, 'Ada');");
try {
const { composable } = buildExportHarness({
columns: ["display_id", "display_name"],
rows: [[1, "Ada"]],
databaseType: "mysql",
context: "table-data",
tableMeta: {
tableName: "users",
primaryKeys: ["id"],
},
sourceColumns: ["id", "name"],
});
await composable.exportSql([1]);
assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].columns, ["id", "name"]);
assert.match((await download.content()) ?? "", /`id`, `name`/);
} finally {
download.restore();
}
});
test("complete local query result export removes only internal hidden columns", async () => { test("complete local query result export removes only internal hidden columns", async () => {
const completeLocalResult: QueryResult = { const completeLocalResult: QueryResult = {
columns: ["id", "name", "__DBX_PK_id"], columns: ["id", "name", "__DBX_PK_id"],