1 parent
e9998e2806
commit
0a6ab8d360
28 files changed
+923
-85
No files matched your search
@@ -1,19 +1,29 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
import { computed, ref } from "vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import type { SqlExportOptions, SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
import type { SqlExportColumnSelection, SqlExportOptions, SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
|
||||
const { t } = useI18n();
|
||||
const open = defineModel<boolean>("open", { default: false });
|
||||
const props = defineProps<{ allowSplit?: boolean }>();
|
||||
const props = defineProps<{ allowSplit?: boolean; columns?: SqlExportColumnSelection[] }>();
|
||||
const selected = ref<SqlInsertMode>("batch");
|
||||
const selectedColumnIndexes = ref(props.columns?.map((column) => column.sourceIndex) ?? []);
|
||||
const splitSqlOutput = ref(false);
|
||||
const splitSqlPartMaxMb = ref(100);
|
||||
const MIN_SPLIT_SQL_PART_MB = 1;
|
||||
const MAX_SPLIT_SQL_PART_MB = 4096;
|
||||
let outcomeEmitted = false;
|
||||
const columnSelectionEnabled = computed(() => props.columns !== undefined);
|
||||
const selectedColumnSet = computed(() => new Set(selectedColumnIndexes.value));
|
||||
const selectedColumns = computed(() => props.columns?.filter((column) => selectedColumnSet.value.has(column.sourceIndex)) ?? []);
|
||||
const canConfirm = computed(() => !columnSelectionEnabled.value || selectedColumns.value.length > 0);
|
||||
const duplicateColumnNames = computed(() => {
|
||||
const counts = new Map<string, number>();
|
||||
for (const column of props.columns ?? []) counts.set(column.name, (counts.get(column.name) ?? 0) + 1);
|
||||
return new Set([...counts].flatMap(([name, count]) => (count > 1 ? [name] : [])));
|
||||
});
|
||||
|
||||
const emit = defineEmits<{
|
||||
confirm: [options: SqlExportOptions];
|
||||
@@ -27,14 +37,24 @@ function normalizedSplitSqlPartMaxMb(): number {
|
||||
}
|
||||
|
||||
function onConfirm() {
|
||||
if (!canConfirm.value) return;
|
||||
outcomeEmitted = true;
|
||||
open.value = false;
|
||||
emit("confirm", {
|
||||
insertMode: selected.value,
|
||||
splitMaxMb: props.allowSplit && splitSqlOutput.value ? normalizedSplitSqlPartMaxMb() : undefined,
|
||||
...(columnSelectionEnabled.value ? { selectedColumns: selectedColumns.value } : {}),
|
||||
});
|
||||
}
|
||||
|
||||
function selectAllColumns() {
|
||||
selectedColumnIndexes.value = props.columns?.map((column) => column.sourceIndex) ?? [];
|
||||
}
|
||||
|
||||
function clearColumns() {
|
||||
selectedColumnIndexes.value = [];
|
||||
}
|
||||
|
||||
function onCancel() {
|
||||
if (outcomeEmitted) return;
|
||||
outcomeEmitted = true;
|
||||
@@ -69,6 +89,27 @@ function onOpenChange(value: boolean) {
|
||||
<span class="mt-1 block text-xs text-muted-foreground">{{ t("grid.sqlInsertModeSingleDescription") }}</span>
|
||||
</span>
|
||||
</label>
|
||||
<div v-if="columnSelectionEnabled" class="space-y-2 rounded-md border p-3" data-sql-export-columns>
|
||||
<div class="flex items-center justify-between gap-3">
|
||||
<div>
|
||||
<p class="text-sm font-medium">{{ t("databaseExport.sqlColumnSelection") }}</p>
|
||||
<p class="text-xs text-muted-foreground">{{ t("databaseExport.selectedColumns", { selected: selectedColumns.length, total: props.columns?.length ?? 0 }) }}</p>
|
||||
</div>
|
||||
<div class="flex gap-2">
|
||||
<Button type="button" variant="ghost" size="sm" data-sql-export-select-all @click="selectAllColumns">{{ t("databaseExport.selectAllColumns") }}</Button>
|
||||
<Button type="button" variant="ghost" size="sm" data-sql-export-clear @click="clearColumns">{{ t("databaseExport.clearColumns") }}</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="max-h-48 space-y-1 overflow-y-auto rounded border p-2">
|
||||
<label v-for="column in props.columns" :key="column.sourceIndex" class="flex cursor-pointer items-center gap-2 rounded px-2 py-1 text-sm hover:bg-accent/50">
|
||||
<input v-model="selectedColumnIndexes" type="checkbox" :value="column.sourceIndex" class="h-4 w-4" :data-sql-export-column="column.sourceIndex" />
|
||||
<span class="truncate"
|
||||
>{{ column.name }}<span v-if="duplicateColumnNames.has(column.name)" class="text-muted-foreground"> #{{ column.nameOccurrence + 1 }}</span></span
|
||||
>
|
||||
</label>
|
||||
</div>
|
||||
<p v-if="!canConfirm" role="alert" class="text-xs text-destructive" data-sql-export-column-error>{{ t("databaseExport.selectAtLeastOneColumn") }}</p>
|
||||
</div>
|
||||
<div v-if="props.allowSplit" class="space-y-2 rounded-md border p-3">
|
||||
<label class="flex cursor-pointer items-center gap-2 text-sm">
|
||||
<input v-model="splitSqlOutput" type="checkbox" class="h-4 w-4" data-sql-split-output />
|
||||
@@ -85,7 +126,7 @@ function onOpenChange(value: boolean) {
|
||||
</div>
|
||||
<DialogFooter>
|
||||
<Button variant="outline" @click="onCancel">{{ t("common.cancel") }}</Button>
|
||||
<Button data-sql-insert-mode-confirm @click="onConfirm">{{ t("common.confirm") }}</Button>
|
||||
<Button :disabled="!canConfirm" data-sql-insert-mode-confirm @click="onConfirm">{{ t("common.confirm") }}</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
import { createApp, h, nextTick, type App, defineComponent } from "vue";
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import i18n from "@/i18n";
|
||||
import { sqlExportColumnChoices } from "@/lib/export/sqlExportColumns";
|
||||
import type { SqlExportColumnSelection } from "@/lib/export/sqlInsertMode";
|
||||
|
||||
vi.mock("@/components/ui/dialog", async () => {
|
||||
const { defineComponent, h } = await import("vue");
|
||||
@@ -37,13 +39,13 @@ afterEach(() => {
|
||||
i18n.global.locale.value = "en";
|
||||
});
|
||||
|
||||
async function mountDialog(onConfirm = () => {}, onCancel = () => {}, allowSplit = false) {
|
||||
async function mountDialog(onConfirm = () => {}, onCancel = () => {}, allowSplit = false, columns?: SqlExportColumnSelection[]) {
|
||||
const container = document.createElement("div");
|
||||
document.body.appendChild(container);
|
||||
const app = createApp(
|
||||
defineComponent({
|
||||
setup() {
|
||||
return () => h(SqlInsertModeDialog, { open: true, allowSplit, onConfirm, onCancel });
|
||||
return () => h(SqlInsertModeDialog, { open: true, allowSplit, columns, onConfirm, onCancel });
|
||||
},
|
||||
}),
|
||||
);
|
||||
@@ -54,6 +56,37 @@ async function mountDialog(onConfirm = () => {}, onCancel = () => {}, allowSplit
|
||||
}
|
||||
|
||||
describe("SqlInsertModeDialog", () => {
|
||||
it("defaults to every column and allows deselecting one duplicate independently", async () => {
|
||||
const onConfirm = vi.fn();
|
||||
const choices = sqlExportColumnChoices(["id", "name", "id"]);
|
||||
await mountDialog(onConfirm, () => {}, false, choices);
|
||||
expect([...document.querySelectorAll<HTMLInputElement>("[data-sql-export-column]")].every((input) => input.checked)).toBe(true);
|
||||
expect(document.body.textContent).toContain("#1");
|
||||
expect(document.body.textContent).toContain("#2");
|
||||
document.querySelector<HTMLInputElement>('[data-sql-export-column="0"]')?.click();
|
||||
await nextTick();
|
||||
document.querySelector<HTMLButtonElement>("[data-sql-insert-mode-confirm]")?.click();
|
||||
expect(onConfirm).toHaveBeenCalledWith({ insertMode: "batch", splitMaxMb: undefined, selectedColumns: choices.slice(1) });
|
||||
});
|
||||
|
||||
it("blocks an empty selection and restores every column with select all", async () => {
|
||||
const onConfirm = vi.fn();
|
||||
const choices = sqlExportColumnChoices(["id", "name"]);
|
||||
await mountDialog(onConfirm, () => {}, true, choices);
|
||||
document.querySelector<HTMLButtonElement>("[data-sql-export-clear]")?.click();
|
||||
await nextTick();
|
||||
const confirm = document.querySelector<HTMLButtonElement>("[data-sql-insert-mode-confirm]");
|
||||
expect(confirm?.disabled).toBe(true);
|
||||
expect(document.querySelector("[data-sql-export-column-error]")).not.toBeNull();
|
||||
confirm?.click();
|
||||
expect(onConfirm).not.toHaveBeenCalled();
|
||||
document.querySelector<HTMLButtonElement>("[data-sql-export-select-all]")?.click();
|
||||
await nextTick();
|
||||
expect(confirm?.disabled).toBe(false);
|
||||
confirm?.click();
|
||||
expect(onConfirm).toHaveBeenCalledWith({ insertMode: "batch", splitMaxMb: undefined, selectedColumns: choices });
|
||||
});
|
||||
|
||||
it("defaults to batch mode and emits the selected single-row mode", async () => {
|
||||
const onConfirm = vi.fn();
|
||||
await mountDialog(onConfirm);
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
import { computed, ref } from "vue";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { useDataGridExport, type UseDataGridExportOptions } from "@/composables/useDataGridExport";
|
||||
import { useExportTracker } from "@/composables/useExportTracker";
|
||||
import { sqlExportColumnChoices } from "@/lib/export/sqlExportColumns";
|
||||
import { showSqlInsertModeDialog } from "@/lib/export/sqlInsertMode";
|
||||
import { formatSqlInsert } from "@/lib/export/exportFormats";
|
||||
import { saveTextFile } from "@/lib/export/saveTextFile";
|
||||
import * as api from "@/lib/backend/api";
|
||||
import type { QueryResult } from "@/types/database";
|
||||
|
||||
const mocks = vi.hoisted(() => ({ native: true, toast: vi.fn() }));
|
||||
vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => mocks.native }));
|
||||
vi.mock("@tauri-apps/plugin-dialog", () => ({ save: vi.fn().mockResolvedValue("/exports/result.sql") }));
|
||||
vi.mock("@/lib/backend/api", () => ({ startQueryResultExport: vi.fn(), startTableExport: vi.fn(), cancelQueryResultExport: vi.fn(), cancelTableExport: vi.fn() }));
|
||||
vi.mock("@/composables/useToast", () => ({ useToast: () => ({ toast: mocks.toast }) }));
|
||||
vi.mock("@/composables/useDataGridExtractor", () => ({ useDataGridExtractor: () => ({ copyWithExtractor: vi.fn(), previewWithExtractor: vi.fn(), canCopyWithExtractor: vi.fn() }) }));
|
||||
vi.mock("@/stores/settingsStore", () => ({ useSettingsStore: () => ({ editorSettings: { exportBatchSize: 1000, globalDateTimeExportFormat: "", numericColumnRightAlign: true } }) }));
|
||||
vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => key }) }));
|
||||
vi.mock("@/i18n", () => ({ default: { install() {} } }));
|
||||
vi.mock("@/lib/export/sqlInsertMode", () => ({ showSqlInsertModeDialog: vi.fn() }));
|
||||
vi.mock("@/lib/export/exportFormats", () => ({ formatSqlInsert: vi.fn().mockResolvedValue("INSERT INTO users VALUES ('Ada');"), formatTsv: vi.fn() }));
|
||||
vi.mock("@/lib/export/saveTextFile", async (importOriginal) => ({ ...(await importOriginal<object>()), saveTextFile: vi.fn() }));
|
||||
|
||||
function createOptions(overrides: Partial<UseDataGridExportOptions> = {}): UseDataGridExportOptions {
|
||||
const items = [
|
||||
{ id: 7, sourceIndex: 0, data: [1, "Ada"], isNew: false, isDeleted: false, isDirtyCol: [], status: "" },
|
||||
{ id: 8, sourceIndex: 1, data: [2, "Lin"], isNew: false, isDeleted: false, isDirtyCol: [], status: "" },
|
||||
];
|
||||
return {
|
||||
columns: computed(() => ["id", "name"]),
|
||||
displayItems: computed(() => items),
|
||||
sql: computed(() => "SELECT id, name FROM users"),
|
||||
tableMeta: computed(() => ({
|
||||
tableName: "users",
|
||||
primaryKeys: [],
|
||||
columns: [
|
||||
{ name: "id", data_type: "int" },
|
||||
{ name: "name", data_type: "text" },
|
||||
],
|
||||
})),
|
||||
databaseType: computed(() => "postgres"),
|
||||
connectionId: computed(() => "conn"),
|
||||
database: computed(() => "dbx"),
|
||||
context: computed(() => "results"),
|
||||
sourceColumns: computed(() => ["id", "name"]),
|
||||
columnTypes: computed(() => ["int4", "text"]),
|
||||
whereInput: computed(() => undefined),
|
||||
orderBy: computed(() => undefined),
|
||||
exportBatchSize: computed(() => 1000),
|
||||
hasCellSelection: computed(() => false),
|
||||
selectedCells: computed(() => ({ columns: [], rows: [] })),
|
||||
selectedCellMatrix: computed(() => null),
|
||||
selectedRange: computed(() => null),
|
||||
contextCell: ref(null),
|
||||
contextSelectionIsSynthetic: ref(false),
|
||||
getRowItem: (id) => items.find((item) => item.id === id),
|
||||
selectedRowIds: ref(new Set<number>()),
|
||||
hasRowSelection: computed(() => false),
|
||||
queryResultExportRequest: vi.fn(async (request) => ({ ...request, connectionId: "conn", database: "dbx", databaseType: "postgres", sql: "SELECT id, name FROM users", queryBaseSql: "SELECT id, name FROM users", useAgentCursor: false, pageSize: 1000, keysetOptimizationEnabled: true })),
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
describe("SQL export column selection across entrypoints", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
mocks.native = true;
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "single", selectedColumns: [sqlExportColumnChoices(["id", "name"])[1]!] });
|
||||
const done = { exportId: "export", tableName: "users", rowsExported: 2, totalRows: 2, status: "Done" as const };
|
||||
vi.mocked(api.startQueryResultExport).mockResolvedValue(done);
|
||||
vi.mocked(api.startTableExport).mockResolvedValue(done);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
const tracker = useExportTracker();
|
||||
for (const task of tracker.tasks.value) tracker.removeTask(task.exportId);
|
||||
});
|
||||
|
||||
it("passes full-result selection to backend without changing query, paging or metadata", async () => {
|
||||
const choices = sqlExportColumnChoices(["id", "name", "id"]);
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "single", selectedColumns: [choices[2]!] });
|
||||
const state = useDataGridExport(createOptions({ allColumns: computed(() => ["id", "name", "id"]), allColumnTypes: computed(() => ["int", "text", "bigint"]) }));
|
||||
await state.exportSql();
|
||||
expect(showSqlInsertModeDialog).toHaveBeenCalledWith({ allowSplit: false, columns: choices });
|
||||
expect(api.startQueryResultExport).toHaveBeenCalledWith(expect.objectContaining({ selectedColumns: [choices[2]!], exportColumnTypes: ["int", "text", "bigint"], insertMode: "single", keysetOptimizationEnabled: true, sql: "SELECT id, name FROM users" }), expect.any(Function));
|
||||
});
|
||||
|
||||
it("preserves full table paging keys and split options in the backend request", async () => {
|
||||
const selectedColumns = [sqlExportColumnChoices(["id", "name"])[1]!];
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns, splitMaxMb: 128 });
|
||||
await useDataGridExport(createOptions({ context: computed(() => "table-data") })).exportSql();
|
||||
expect(api.startTableExport).toHaveBeenCalledWith(expect.objectContaining({ columns: ["id", "name"], columnTypes: ["int4", "text"], selectedColumns, splitMaxMb: 128 }), expect.any(Function));
|
||||
expect(api.startQueryResultExport).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each(["page", "selected"] as const)("projects %s rows and types together without requerying", async (scope) => {
|
||||
const state = useDataGridExport(createOptions());
|
||||
if (scope === "page") await state.exportCurrentPageSql();
|
||||
else await state.exportSql([8]);
|
||||
expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: ["name"], columnTypes: ["text"], rows: scope === "page" ? [["Ada"], ["Lin"]] : [["Lin"]], insertMode: "single" }));
|
||||
expect(api.startQueryResultExport).not.toHaveBeenCalled();
|
||||
expect(api.startTableExport).not.toHaveBeenCalled();
|
||||
expect(saveTextFile).toHaveBeenCalledOnce();
|
||||
});
|
||||
|
||||
it("keeps second duplicate, spatial metadata and raw types aligned after internal-key removal", async () => {
|
||||
const names = ["__DBX_ROWID", "id", "id", "shape"];
|
||||
const choices = sqlExportColumnChoices(names);
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns: [choices[2]!, choices[3]!] });
|
||||
const result = { columns: names, column_types: ["ROWID", "int", "bigint", "geometry"], rows: [["key", 1, 20, "POINT(1 2)"]], hidden_column_indexes: [0], spatial_columns: [{ column_index: 3, srid: 4326 }], spatial_values: [[null, null, null, 4326]] } as QueryResult;
|
||||
await useDataGridExport(createOptions({ databaseType: computed(() => "oracle"), allColumns: computed(() => names), hasCompleteLocalResult: computed(() => true), completeLocalResult: computed(() => result) })).exportSql();
|
||||
expect(showSqlInsertModeDialog).toHaveBeenCalledWith({ allowSplit: false, columns: choices.slice(1) });
|
||||
expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: ["id", "shape"], columnTypes: ["bigint", "geometry"], rows: [[20, "POINT(1 2)"]], spatialColumns: [{ column_index: 1, srid: 4326 }], spatialValues: [[null, 4326]] }));
|
||||
expect(api.startQueryResultExport).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("applies the selection to the Web full-result fallback", async () => {
|
||||
mocks.native = false;
|
||||
const fullExportResult = vi.fn(async () => ({ columns: ["id", "name"], column_types: ["int", "varchar"], rows: [[3, "Grace"]] }) as QueryResult);
|
||||
await useDataGridExport(createOptions({ fullExportResult })).exportSql();
|
||||
expect(fullExportResult).toHaveBeenCalledOnce();
|
||||
expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: ["name"], columnTypes: ["text"], rows: [["Grace"]] }));
|
||||
});
|
||||
|
||||
it("does not remap reordered full-table results by visible positions", async () => {
|
||||
mocks.native = false;
|
||||
const fullExportResult = vi.fn(async () => ({ columns: ["name", "id"], column_types: ["varchar", "bigint"], rows: [["Grace", 3]] }) as QueryResult);
|
||||
await useDataGridExport(createOptions({ context: computed(() => "table-data"), tableMeta: computed(() => ({ tableName: "users", catalog: "external", primaryKeys: [], columns: [] })), fullExportResult })).exportSql();
|
||||
expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: ["name"], columnTypes: ["varchar"], rows: [["Grace"]] }));
|
||||
});
|
||||
|
||||
it("omits generated MySQL columns from the chooser but preserves identity and expression defaults", async () => {
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue(null);
|
||||
const names = ["id", "generated", "defaulted", "identity"];
|
||||
await useDataGridExport(
|
||||
createOptions({
|
||||
context: computed(() => "table-data"),
|
||||
databaseType: computed(() => "mysql"),
|
||||
columns: computed(() => names),
|
||||
sourceColumns: computed(() => names),
|
||||
tableMeta: computed(() => ({
|
||||
tableName: "users",
|
||||
primaryKeys: ["id"],
|
||||
columns: [
|
||||
{ name: "id", data_type: "int", extra: "auto_increment" },
|
||||
{ name: "generated", data_type: "text", extra: "VIRTUAL GENERATED" },
|
||||
{ name: "defaulted", data_type: "timestamp", extra: "DEFAULT_GENERATED" },
|
||||
{ name: "identity", data_type: "int", extra: "auto_increment" },
|
||||
],
|
||||
})),
|
||||
}),
|
||||
).exportSql();
|
||||
expect(showSqlInsertModeDialog).toHaveBeenCalledWith({ allowSplit: true, columns: sqlExportColumnChoices(names).filter((column) => column.name !== "generated") });
|
||||
});
|
||||
|
||||
it("omits PostgreSQL tsvector fields using query metadata", async () => {
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue(null);
|
||||
await useDataGridExport(createOptions({ allColumns: computed(() => ["id", "search"]), allColumnTypes: computed(() => ["int", "pg_catalog.tsvector"]) })).exportSql();
|
||||
expect(showSqlInsertModeDialog).toHaveBeenCalledWith({ allowSplit: false, columns: sqlExportColumnChoices(["id"]) });
|
||||
});
|
||||
|
||||
it("does not export after cancellation or an invalid empty selection", async () => {
|
||||
const state = useDataGridExport(createOptions());
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue(null);
|
||||
await state.exportSql();
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns: [] });
|
||||
await state.exportCurrentPageSql();
|
||||
expect(api.startQueryResultExport).not.toHaveBeenCalled();
|
||||
expect(formatSqlInsert).not.toHaveBeenCalled();
|
||||
expect(saveTextFile).not.toHaveBeenCalled();
|
||||
expect(mocks.toast).toHaveBeenCalledWith("grid.exportFailed", 5000);
|
||||
});
|
||||
|
||||
it("keeps legacy omitted selection behavior", async () => {
|
||||
vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch" });
|
||||
await useDataGridExport(createOptions()).exportCurrentPageSql();
|
||||
expect(formatSqlInsert).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
columns: ["id", "name"],
|
||||
rows: [
|
||||
[1, "Ada"],
|
||||
[2, "Lin"],
|
||||
],
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -15,7 +15,8 @@ import { clipboardLineEndings, copyToClipboard } from "@/lib/common/clipboard";
|
||||
import { clearDataGridClipboardCopy, rememberDataGridClipboardCopy } from "@/lib/dataGrid/dataGridClipboard";
|
||||
import { buildDataGridCopyInsertStatement, type DataGridCopyInsertMode, type DataGridTableMeta } from "@/lib/dataGrid/dataGridSql";
|
||||
import { formatSqlInsert, formatTsv } from "@/lib/export/exportFormats";
|
||||
import { showSqlInsertModeDialog, type SqlExportOptions, type SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
import { showSqlInsertModeDialog, type SqlExportColumnSelection, type SqlExportOptions, type SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
import { resolveSqlExportColumnIndexes, sqlExportColumnChoices } from "@/lib/export/sqlExportColumns";
|
||||
import { summarizeExportRows } from "@/lib/export/exportDiagnostics";
|
||||
import { appendDebugLog, appendNativeProcessMemoryLog, getBrowserMemorySnapshot, isDebugLoggingEnabled } from "@/lib/backend/debugLog";
|
||||
import { uuid } from "@/lib/common/utils";
|
||||
@@ -339,7 +340,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
});
|
||||
}
|
||||
|
||||
function normalizeCompleteLocalResult(result: QueryResult): { columns: string[]; columnTypes: string[]; columnComments: Array<string | undefined>; rows: CellValue[][]; mongoCopyDocuments?: unknown[] } {
|
||||
function normalizeCompleteLocalResult(result: QueryResult): { columns: string[]; columnTypes: string[]; columnComments: Array<string | undefined>; rows: CellValue[][]; mongoCopyDocuments?: unknown[]; spatialColumns?: QueryResult["spatial_columns"]; spatialValues?: QueryResult["spatial_values"] } {
|
||||
const editorSettings = useSettingsStore().editorSettings;
|
||||
if (databaseType.value === "mongodb") {
|
||||
const projected = projectResultColumns(result, columns.value);
|
||||
@@ -350,6 +351,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
columnComments: commentsForExportColumns(projected.columns),
|
||||
rows,
|
||||
mongoCopyDocuments: result.mongo_copy_documents?.slice(0, rows.length),
|
||||
spatialColumns: projected.spatialColumns,
|
||||
spatialValues: projected.spatialValues?.slice(0, rows.length),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -357,6 +360,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
const exportedColumnIndexes = result.columns.map((_, index) => index).filter((index) => !hiddenColumnIndexes.has(index));
|
||||
const hasHiddenColumns = exportedColumnIndexes.length !== result.columns.length;
|
||||
const rows = editorSettings.exportRowLimitEnabled ? result.rows.slice(0, editorSettings.exportRowLimit) : result.rows;
|
||||
const targetIndexBySource = new Map(exportedColumnIndexes.map((sourceIndex, index) => [sourceIndex, index]));
|
||||
|
||||
// Internal key columns are query-only metadata. Keep every user column,
|
||||
// including columns hidden manually in the grid, while preserving alignment.
|
||||
@@ -366,6 +370,11 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
columnComments: hasHiddenColumns ? exportedColumnIndexes.map((index) => allXlsxColumnComments.value[index]) : [...allXlsxColumnComments.value],
|
||||
rows: hasHiddenColumns ? rows.map((row) => exportedColumnIndexes.map((index) => row[index])) : rows,
|
||||
mongoCopyDocuments: result.mongo_copy_documents?.slice(0, rows.length),
|
||||
spatialColumns: result.spatial_columns?.flatMap((column) => {
|
||||
const columnIndex = targetIndexBySource.get(column.column_index);
|
||||
return columnIndex === undefined ? [] : [{ ...column, column_index: columnIndex }];
|
||||
}),
|
||||
spatialValues: result.spatial_values?.slice(0, rows.length).map((row) => exportedColumnIndexes.map((index) => row[index] ?? null)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -473,8 +482,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
formatDateTime && !preserveMongoExtendedJson,
|
||||
),
|
||||
columnComments,
|
||||
spatialColumns: completeLocalResult.value.spatial_columns,
|
||||
spatialValues: completeLocalResult.value.spatial_values,
|
||||
spatialColumns: normalized.spatialColumns,
|
||||
spatialValues: normalized.spatialValues,
|
||||
};
|
||||
}
|
||||
const commentHeader = buildXlsxHeaderOverrides(columns.value, visibleXlsxColumnComments.value, headerMode);
|
||||
@@ -1378,11 +1387,11 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
tableName: meta.tableName,
|
||||
filePath: outputPath,
|
||||
format,
|
||||
...(format === "sql" && sqlExportOptions ? { insertMode: sqlExportOptions.insertMode, splitMaxMb: sqlExportOptions.splitMaxMb } : {}),
|
||||
...(format === "sql" && sqlExportOptions ? { insertMode: sqlExportOptions.insertMode, splitMaxMb: sqlExportOptions.splitMaxMb, selectedColumns: sqlExportOptions.selectedColumns } : {}),
|
||||
csvQuoteMode: editorSettings.csvQuoteMode,
|
||||
columns: columns.value,
|
||||
columns: format === "sql" ? effectiveColumns(sourceColumns.value, columns.value).map((column, index) => column ?? columns.value[index]!) : columns.value,
|
||||
columnTypes: columnTypes.value,
|
||||
...(format === "sql" ? { columnExtras: sqlExportColumnExtras(columns.value) } : {}),
|
||||
...(format === "sql" ? { columnExtras: sqlExportColumnExtras(effectiveColumns(sourceColumns.value, columns.value).map((column, index) => column ?? columns.value[index]!)) } : {}),
|
||||
columnComments: format === "xlsx" ? buildXlsxHeaderOverrides(columns.value, visibleXlsxColumnComments.value, headerMode) : undefined,
|
||||
primaryKeys: meta.primaryKeys,
|
||||
...sqlExportPrimaryKeyOptions(),
|
||||
@@ -1421,7 +1430,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
return true;
|
||||
}
|
||||
|
||||
async function exportQueryResultViaBackend(format: "csv" | "xlsx" | "json" | "txt" | "sql", rowIds?: number[], includeSqlSheet = false, headerMode: XlsxHeaderMode = "name", autoFilter = true, insertMode?: SqlInsertMode): Promise<boolean> {
|
||||
async function exportQueryResultViaBackend(format: "csv" | "xlsx" | "json" | "txt" | "sql", rowIds?: number[], includeSqlSheet = false, headerMode: XlsxHeaderMode = "name", autoFilter = true, sqlExportOptions?: SqlExportOptions): Promise<boolean> {
|
||||
if (rowIds !== undefined || context.value !== "results" || !queryResultExportRequest) {
|
||||
return false;
|
||||
}
|
||||
@@ -1453,12 +1462,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
exportTableName: format === "sql" ? tableMeta.value?.tableName : undefined,
|
||||
exportColumnTypes: format === "sql" ? allColumnTypes.value?.map((type) => type ?? null) : undefined,
|
||||
exportColumnExtras: format === "sql" ? sqlExportColumnExtras(allColumns.value) : undefined,
|
||||
...(format === "sql" && insertMode ? { insertMode } : {}),
|
||||
...(format === "sql" && sqlExportOptions ? { insertMode: sqlExportOptions.insertMode } : {}),
|
||||
});
|
||||
const columnComments = format === "xlsx" ? buildXlsxHeaderOverrides(allColumns.value, allXlsxColumnComments.value, headerMode) : undefined;
|
||||
const request = baseRequest
|
||||
? {
|
||||
...baseRequest,
|
||||
...(format === "sql" ? { selectedColumns: sqlExportOptions?.selectedColumns } : {}),
|
||||
csvQuoteMode: useSettingsStore().editorSettings.csvQuoteMode,
|
||||
...sqlExportPrimaryKeyOptions(),
|
||||
dateTimeFormat: useSettingsStore().editorSettings.globalDateTimeExportFormat || undefined,
|
||||
@@ -1537,9 +1547,23 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
return true;
|
||||
}
|
||||
|
||||
async function exportQueryResultSqlViaBackend(rowIds: number[] | undefined, insertMode: SqlInsertMode): Promise<boolean> {
|
||||
async function exportQueryResultSqlViaBackend(rowIds: number[] | undefined, sqlExportOptions: SqlExportOptions): Promise<boolean> {
|
||||
if (!isTauriRuntime()) return false;
|
||||
return exportQueryResultViaBackend("sql", rowIds, false, "name", true, insertMode);
|
||||
return exportQueryResultViaBackend("sql", rowIds, false, "name", true, sqlExportOptions);
|
||||
}
|
||||
|
||||
function sqlExportChoices(fullResult: boolean): SqlExportColumnSelection[] {
|
||||
const names = context.value === "table-data" ? effectiveColumns(sourceColumns.value, columns.value) : fullResult ? allColumns.value : columns.value;
|
||||
const excluded = new Set((sqlExportExcludedColumns() ?? []).map(normalizeColumnName));
|
||||
const types = fullResult && context.value === "results" ? allColumnTypes.value : columnTypes.value;
|
||||
const metadataByName = new Map((tableMeta.value?.columns ?? []).map((column) => [normalizeColumnName(column.name), column]));
|
||||
return sqlExportColumnChoices(names).filter((column) => {
|
||||
if (excluded.has(normalizeColumnName(column.name)) || usesSyntheticRowIdKey(databaseType.value, [column.name])) return false;
|
||||
const metadata = metadataByName.get(normalizeColumnName(column.name));
|
||||
if (databaseType.value === "mysql" && /\b(?:virtual|stored|persistent)\s+generated\b|\bgenerated\s+always\s+as\s*\(/i.test(metadata?.extra ?? "")) return false;
|
||||
const columnType = (metadata?.data_type || types?.[column.sourceIndex])?.trim().replace(/^"|"$/g, "").toLowerCase();
|
||||
return databaseType.value !== "postgres" || (columnType !== "tsvector" && !columnType?.endsWith(".tsvector"));
|
||||
});
|
||||
}
|
||||
|
||||
async function exportSql(rowIds?: number[]) {
|
||||
@@ -1568,12 +1592,12 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
},
|
||||
true,
|
||||
);
|
||||
const selectedSqlExportOptions = (await showSqlInsertModeDialog({ allowSplit: rowIds === undefined && context.value === "table-data" })) as SqlExportOptions | SqlInsertMode | null;
|
||||
const selectedSqlExportOptions = (await showSqlInsertModeDialog({ allowSplit: rowIds === undefined && context.value === "table-data", columns: sqlExportChoices(rowIds === undefined) })) as SqlExportOptions | SqlInsertMode | null;
|
||||
if (selectedSqlExportOptions === null) {
|
||||
logExportStage("cancelled", { stage: "insert-mode-dialog" });
|
||||
return;
|
||||
}
|
||||
const sqlExportOptions = typeof selectedSqlExportOptions === "string" ? { insertMode: selectedSqlExportOptions } : selectedSqlExportOptions;
|
||||
const sqlExportOptions: SqlExportOptions = typeof selectedSqlExportOptions === "string" ? { insertMode: selectedSqlExportOptions } : selectedSqlExportOptions;
|
||||
const insertMode = sqlExportOptions.insertMode;
|
||||
logExportStage("mode-selected", { insertMode, splitMaxMb: sqlExportOptions.splitMaxMb });
|
||||
try {
|
||||
@@ -1588,7 +1612,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
|
||||
// Step 2: query-result context — NEW backend streaming with background task
|
||||
logExportStage("query-backend-export-start");
|
||||
const handledQueryByBackend = await exportQueryResultSqlViaBackend(rowIds, insertMode);
|
||||
const handledQueryByBackend = await exportQueryResultSqlViaBackend(rowIds, sqlExportOptions);
|
||||
logExportStage("query-backend-export-finished", { handledByBackend: handledQueryByBackend });
|
||||
if (handledQueryByBackend) {
|
||||
logExportStage("done", { path: "query-backend" });
|
||||
@@ -1608,7 +1632,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
);
|
||||
|
||||
logExportStage("row-remap-start");
|
||||
const exportData = sqlInsertExportData(result);
|
||||
const exportData = sqlInsertExportData(result, sqlExportOptions.selectedColumns);
|
||||
logExportStage("row-remap-done", {
|
||||
columns: exportData.columns.length,
|
||||
rows: exportData.rows.length,
|
||||
@@ -1653,12 +1677,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
|
||||
async function exportCurrentPageSql() {
|
||||
await runExclusiveExport(async () => {
|
||||
const selectedSqlExportOptions = (await showSqlInsertModeDialog()) as SqlExportOptions | SqlInsertMode | null;
|
||||
const selectedSqlExportOptions = (await showSqlInsertModeDialog({ columns: sqlExportChoices(false) })) as SqlExportOptions | SqlInsertMode | null;
|
||||
if (selectedSqlExportOptions === null) return;
|
||||
const insertMode = typeof selectedSqlExportOptions === "string" ? selectedSqlExportOptions : selectedSqlExportOptions.insertMode;
|
||||
const sqlExportOptions: SqlExportOptions = typeof selectedSqlExportOptions === "string" ? { insertMode: selectedSqlExportOptions } : selectedSqlExportOptions;
|
||||
const insertMode = sqlExportOptions.insertMode;
|
||||
try {
|
||||
const result = await resultToExport(undefined, undefined, false, false);
|
||||
const exportData = sqlInsertExportData(result);
|
||||
const exportData = sqlInsertExportData(result, sqlExportOptions.selectedColumns);
|
||||
const content = await formatSqlInsert({
|
||||
databaseType: databaseType.value,
|
||||
identifierQuote: options.identifierQuote?.value,
|
||||
@@ -1686,7 +1711,10 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
await copyText(sql.value);
|
||||
}
|
||||
|
||||
function sqlInsertExportData(result: { columns: string[]; rows: CellValue[][]; spatialColumns?: QueryResult["spatial_columns"]; spatialValues?: QueryResult["spatial_values"] }): {
|
||||
function sqlInsertExportData(
|
||||
result: { columns: string[]; columnTypes?: Array<string | undefined>; rows: CellValue[][]; spatialColumns?: QueryResult["spatial_columns"]; spatialValues?: QueryResult["spatial_values"] },
|
||||
selectedColumns?: SqlExportColumnSelection[],
|
||||
): {
|
||||
columns: string[];
|
||||
columnTypes?: Array<string | undefined>;
|
||||
columnExtras?: Array<string | null>;
|
||||
@@ -1694,9 +1722,12 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
|
||||
spatialValues?: QueryResult["spatial_values"];
|
||||
rows: CellValue[][];
|
||||
} {
|
||||
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 exportColumnTypes = columnTypes.value?.length === result.columns.length ? columnTypes.value : undefined;
|
||||
const matchesVisibleColumns = result.columns.length === columns.value.length && result.columns.every((column, index) => column === columns.value[index]);
|
||||
const exportColumns = context.value === "table-data" && tableMeta.value && matchesVisibleColumns ? effectiveColumns(sourceColumns.value, result.columns) : result.columns;
|
||||
const columnIndexes = resolveSqlExportColumnIndexes(exportColumns, selectedColumns)
|
||||
.map((index) => ({ column: exportColumns[index], index }))
|
||||
.filter((item): item is { column: string; index: number } => !!item.column);
|
||||
const exportColumnTypes = matchesVisibleColumns && columnTypes.value?.length === result.columns.length ? columnTypes.value : result.columnTypes?.length === result.columns.length ? result.columnTypes : undefined;
|
||||
const metaColumns = tableMeta.value?.columns;
|
||||
const exportColumnExtras = metaColumns?.length ? exportColumns.map((column) => (column ? (metaColumns.find((meta) => normalizeColumnName(meta.name) === normalizeColumnName(column))?.extra ?? null) : null)) : undefined;
|
||||
const indexBySource = new Map(columnIndexes.map((item, index) => [item.index, index]));
|
||||
|
||||
@@ -8521,6 +8521,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "DDL-dən əvvəl DROP TABLE IF EXISTS ifadəsini əlavə et",
|
||||
omitAutoIncrement: "AUTO_INCREMENT parametrini daxil etmə (yeni quraşdırma skriptləri üçün)",
|
||||
includeData: "Cədvəl məlumatları (INSERT)",
|
||||
sqlColumnSelection: "İxrac ediləcək sütunlar",
|
||||
selectedColumns: "{selected}/{total} sütun seçilib",
|
||||
selectAllColumns: "Hamısını seç",
|
||||
clearColumns: "Təmizlə",
|
||||
selectAtLeastOneColumn: "İxrac üçün ən azı bir sütun seçin.",
|
||||
includeObjects: "Görünüşlər / prosedurlar / funksiyalar / ardıcıllıqlar",
|
||||
splitSqlOutput: "SQL ixracını ZIP arxivinə böl",
|
||||
splitSqlPartMaxMb: "Hər SQL hissəsi üçün maksimum ölçü (MB)",
|
||||
|
||||
@@ -9235,6 +9235,11 @@ export default {
|
||||
dropTableIfExists: "Add DROP TABLE IF EXISTS before DDL",
|
||||
omitAutoIncrement: "Omit AUTO_INCREMENT (for fresh-install scripts)",
|
||||
includeData: "Table data (INSERT)",
|
||||
sqlColumnSelection: "Columns to export",
|
||||
selectedColumns: "{selected}/{total} columns selected",
|
||||
selectAllColumns: "Select all",
|
||||
clearColumns: "Clear",
|
||||
selectAtLeastOneColumn: "Select at least one column to export.",
|
||||
standardSqlInsert: "Use Standard SQL INSERT for table data",
|
||||
standardSqlInsertDescription: "Uses ANSI double-quoted identifiers and portable scalar literals. DDL and other objects keep the source database dialect.",
|
||||
includeObjects: "Views / Procedures / Functions / Sequences",
|
||||
|
||||
@@ -8570,6 +8570,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "Agregar DROP TABLE IF EXISTS antes del DDL",
|
||||
omitAutoIncrement: "Omitir AUTO_INCREMENT (para scripts de instalación nueva)",
|
||||
includeData: "Datos de tablas (INSERT)",
|
||||
sqlColumnSelection: "Columnas para exportar",
|
||||
selectedColumns: "{selected}/{total} columnas seleccionadas",
|
||||
selectAllColumns: "Seleccionar todas",
|
||||
clearColumns: "Limpiar",
|
||||
selectAtLeastOneColumn: "Selecciona al menos una columna para exportar.",
|
||||
includeObjects: "Vistas / Procedimientos / Funciones / Secuencias",
|
||||
splitSqlOutput: "Dividir la exportación SQL en un archivo ZIP",
|
||||
splitSqlPartMaxMb: "Tamaño máximo por parte SQL (MB)",
|
||||
|
||||
@@ -8496,6 +8496,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "Aggiungi DROP TABLE IF EXISTS prima del DDL",
|
||||
omitAutoIncrement: "Ometti AUTO_INCREMENT (per script di installazione pulita)",
|
||||
includeData: "Dati tabella (INSERT)",
|
||||
sqlColumnSelection: "Colonne da esportare",
|
||||
selectedColumns: "{selected}/{total} colonne selezionate",
|
||||
selectAllColumns: "Seleziona tutto",
|
||||
clearColumns: "Cancella",
|
||||
selectAtLeastOneColumn: "Seleziona almeno una colonna da esportare.",
|
||||
includeObjects: "Viste / Procedure / Funzioni / Sequenze",
|
||||
splitSqlOutput: "Dividere l'esportazione SQL in un archivio ZIP",
|
||||
splitSqlPartMaxMb: "Dimensione massima per parte SQL (MB)",
|
||||
|
||||
@@ -8539,6 +8539,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "DDLの前にDROP TABLE IF EXISTSを追加",
|
||||
omitAutoIncrement: "AUTO_INCREMENT を省略(新規インストール用スクリプト向け)",
|
||||
includeData: "テーブルデータ (INSERT)",
|
||||
sqlColumnSelection: "エクスポートする列",
|
||||
selectedColumns: "{selected}/{total} 列を選択",
|
||||
selectAllColumns: "すべて選択",
|
||||
clearColumns: "クリア",
|
||||
selectAtLeastOneColumn: "エクスポートする列を1つ以上選択してください。",
|
||||
includeObjects: "ビュー / プロシージャ / 関数 / シーケンス",
|
||||
splitSqlOutput: "SQLエクスポートをZIPアーカイブに分割",
|
||||
splitSqlPartMaxMb: "SQLパートあたりの最大サイズ(MB)",
|
||||
|
||||
@@ -8236,6 +8236,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "DDL 앞에 DROP TABLE IF EXISTS 추가",
|
||||
omitAutoIncrement: "AUTO_INCREMENT 생략 (초기 설치 스크립트용)",
|
||||
includeData: "테이블 데이터 (INSERT)",
|
||||
sqlColumnSelection: "내보낼 열",
|
||||
selectedColumns: "{selected}/{total}개 열 선택됨",
|
||||
selectAllColumns: "모두 선택",
|
||||
clearColumns: "지우기",
|
||||
selectAtLeastOneColumn: "내보낼 열을 하나 이상 선택하세요.",
|
||||
includeObjects: "뷰 / 프로시저 / 함수 / 시퀀스",
|
||||
splitSqlOutput: "SQL 내보내기를 ZIP 압축 파일로 분할",
|
||||
splitSqlPartMaxMb: "SQL 파트당 최대 크기(MB)",
|
||||
|
||||
@@ -8496,6 +8496,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "Adicionar DROP TABLE IF EXISTS antes do DDL",
|
||||
omitAutoIncrement: "Omitir AUTO_INCREMENT (para scripts de instalação do zero)",
|
||||
includeData: "Dados da tabela (INSERT)",
|
||||
sqlColumnSelection: "Colunas para exportar",
|
||||
selectedColumns: "{selected}/{total} colunas selecionadas",
|
||||
selectAllColumns: "Selecionar todas",
|
||||
clearColumns: "Limpar",
|
||||
selectAtLeastOneColumn: "Selecione pelo menos uma coluna para exportar.",
|
||||
includeObjects: "Views / Procedures / Funções / Sequências",
|
||||
splitSqlOutput: "Dividir exportação SQL em arquivo ZIP",
|
||||
splitSqlPartMaxMb: "Tamanho máximo por parte SQL (MB)",
|
||||
|
||||
@@ -9727,6 +9727,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "Добавлять DROP TABLE IF EXISTS перед DDL",
|
||||
omitAutoIncrement: "Пропускать AUTO_INCREMENT (для скриптов чистой установки)",
|
||||
includeData: "Данные таблиц (INSERT)",
|
||||
sqlColumnSelection: "Столбцы для экспорта",
|
||||
selectedColumns: "Выбрано столбцов: {selected}/{total}",
|
||||
selectAllColumns: "Выбрать все",
|
||||
clearColumns: "Очистить",
|
||||
selectAtLeastOneColumn: "Выберите хотя бы один столбец для экспорта.",
|
||||
includeObjects: "Представления / Процедуры / Функции / Последовательности",
|
||||
splitSqlOutput: "Разделить экспорт SQL на ZIP-архив",
|
||||
splitSqlPartMaxMb: "Максимальный размер одной части SQL (МБ)",
|
||||
|
||||
@@ -8391,6 +8391,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "DDL'den önce DROP TABLE IF EXISTS ekle",
|
||||
omitAutoIncrement: "AUTO_INCREMENT'i atla (sıfırdan kurulum betikleri için)",
|
||||
includeData: "Tablo verisi (INSERT)",
|
||||
sqlColumnSelection: "Dışa aktarılacak sütunlar",
|
||||
selectedColumns: "{selected}/{total} sütun seçildi",
|
||||
selectAllColumns: "Tümünü seç",
|
||||
clearColumns: "Temizle",
|
||||
selectAtLeastOneColumn: "Dışa aktarmak için en az bir sütun seçin.",
|
||||
includeObjects: "Görünümler / Yordamlar / İşlevler / Diziler",
|
||||
splitSqlOutput: "SQL dışa aktarmayı ZIP arşivine böl",
|
||||
splitSqlPartMaxMb: "SQL parçası başına maksimum boyut (MB)",
|
||||
|
||||
@@ -9198,6 +9198,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "导出前添加 DROP TABLE IF EXISTS",
|
||||
omitAutoIncrement: "省略 AUTO_INCREMENT(用于全新安装的初始化脚本)",
|
||||
includeData: "表数据 (INSERT)",
|
||||
sqlColumnSelection: "要导出的列",
|
||||
selectedColumns: "已选择 {selected}/{total} 列",
|
||||
selectAllColumns: "全选",
|
||||
clearColumns: "清空",
|
||||
selectAtLeastOneColumn: "请至少选择一列导出。",
|
||||
standardSqlInsert: "表数据使用标准 SQL INSERT",
|
||||
standardSqlInsertDescription: "使用 ANSI 双引号标识符和通用标量字面量;DDL 与其他对象仍保留源数据库方言。",
|
||||
includeObjects: "视图 / 存储过程 / 函数 / 序列",
|
||||
|
||||
@@ -7821,6 +7821,11 @@ export default withEnglishFallback({
|
||||
dropTableIfExists: "匯出前新增 DROP TABLE IF EXISTS",
|
||||
omitAutoIncrement: "省略 AUTO_INCREMENT(用於全新安裝的初始化腳本)",
|
||||
includeData: "資料表資料 (INSERT)",
|
||||
sqlColumnSelection: "要匯出的欄位",
|
||||
selectedColumns: "已選取 {selected}/{total} 個欄位",
|
||||
selectAllColumns: "全選",
|
||||
clearColumns: "清除",
|
||||
selectAtLeastOneColumn: "請至少選取一個欄位匯出。",
|
||||
standardSqlInsert: "資料表資料使用標準 SQL INSERT",
|
||||
standardSqlInsertDescription: "使用 ANSI 雙引號識別碼和通用純量常值;DDL 與其他物件仍保留來源資料庫方言。",
|
||||
includeObjects: "檢視 / 預存程序 / 函式 / 序列",
|
||||
|
||||
@@ -51,7 +51,7 @@ import { decodeMeilisearchDocumentPage, decodeMeilisearchSearchResult, type Meil
|
||||
import type { XuguTablespaceInfo } from "@/types/database";
|
||||
import type { CreatedKey, EnqueuedTaskSummary, KeyCreateInput, KeyListItem, KeyPage, KeyUpdateInput, MeilisearchCreateIndexInput, MeilisearchSystemOverview, MeilisearchTask, TaskListInput, TaskPage, TaskSelector } from "@/types/meilisearchManagement";
|
||||
import type { CsvQuoteMode } from "@/lib/export/csvQuoteMode";
|
||||
import type { SqlInsertDialect, SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
import type { SqlExportColumnSelection, SqlInsertDialect, SqlInsertMode } from "@/lib/export/sqlInsertMode";
|
||||
|
||||
/** Normalize Tauri rejections once at the public backend boundary. */
|
||||
async function invokeBackend<T>(command: string, args?: Record<string, unknown>): Promise<T> {
|
||||
@@ -5792,6 +5792,7 @@ export interface TableExportRequest {
|
||||
insertDialect?: SqlInsertDialect;
|
||||
csvQuoteMode?: CsvQuoteMode;
|
||||
columns?: string[];
|
||||
selectedColumns?: SqlExportColumnSelection[];
|
||||
columnTypes?: Array<string | null | undefined>;
|
||||
/** 与 `columns` 对齐的列 EXTRA 元数据(identity 等),用于 SQL INSERT 导出的 `SET IDENTITY_INSERT`。 */
|
||||
columnExtras?: Array<string | null | undefined>;
|
||||
@@ -5857,6 +5858,7 @@ export interface QueryResultExportRequest {
|
||||
dateTimeFormat?: string;
|
||||
exportTableName?: string;
|
||||
exportColumnTypes?: Array<string | null | undefined>;
|
||||
selectedColumns?: SqlExportColumnSelection[];
|
||||
/**
|
||||
* 结果列对应的原表 EXTRA 元数据(identity 等)。后端据此为 SQL INSERT 导出
|
||||
* 补上 `SET IDENTITY_INSERT` 包裹,缺省表示未知。
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { resolveSqlExportColumnIndexes, sqlExportColumnChoices } from "@/lib/export/sqlExportColumns";
|
||||
|
||||
describe("SQL export column identities", () => {
|
||||
it("retains source positions and distinguishes duplicate labels", () => {
|
||||
expect(sqlExportColumnChoices(["id", undefined, "name", "id"])).toEqual([
|
||||
{ sourceIndex: 0, name: "id", nameOccurrence: 0 },
|
||||
{ sourceIndex: 2, name: "name", nameOccurrence: 0 },
|
||||
{ sourceIndex: 3, name: "id", nameOccurrence: 1 },
|
||||
]);
|
||||
});
|
||||
|
||||
it("resolves duplicate occurrences after columns are reordered or internal keys removed", () => {
|
||||
const choices = sqlExportColumnChoices(["__DBX_ROWID", "id", "name", "id"]);
|
||||
expect(resolveSqlExportColumnIndexes(["id", "id", "name"], [choices[3]!, choices[2]!])).toEqual([1, 2]);
|
||||
});
|
||||
|
||||
it("preserves omitted selection and rejects empty, missing and repeated selections", () => {
|
||||
const choices = sqlExportColumnChoices(["id", "id"]);
|
||||
expect(resolveSqlExportColumnIndexes(["id", "name"])).toEqual([0, 1]);
|
||||
expect(() => resolveSqlExportColumnIndexes(["id"], [])).toThrow("at least one");
|
||||
expect(() => resolveSqlExportColumnIndexes(["id"], [choices[1]!])).toThrow("not found");
|
||||
expect(() => resolveSqlExportColumnIndexes(["id"], [choices[0]!, choices[0]!])).toThrow("more than once");
|
||||
});
|
||||
|
||||
it("handles wide projections without collapsing equal labels", () => {
|
||||
const columns = Array.from({ length: 10000 }, () => "value");
|
||||
const choices = sqlExportColumnChoices(columns);
|
||||
expect(resolveSqlExportColumnIndexes(columns, choices)).toEqual(columns.map((_, index) => index));
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,31 @@
|
||||
import type { SqlExportColumnSelection } from "@/lib/export/sqlInsertMode";
|
||||
|
||||
export function sqlExportColumnChoices(columns: readonly (string | undefined)[]): SqlExportColumnSelection[] {
|
||||
const occurrences = new Map<string, number>();
|
||||
return columns.flatMap((name, sourceIndex) => {
|
||||
if (!name) return [];
|
||||
const nameOccurrence = occurrences.get(name) ?? 0;
|
||||
occurrences.set(name, nameOccurrence + 1);
|
||||
return [{ sourceIndex, name, nameOccurrence }];
|
||||
});
|
||||
}
|
||||
|
||||
export function resolveSqlExportColumnIndexes(columns: readonly (string | undefined)[], selectedColumns?: readonly SqlExportColumnSelection[]): number[] {
|
||||
if (selectedColumns === undefined) return columns.map((_, index) => index);
|
||||
if (!selectedColumns.length) throw new Error("Select at least one column for SQL export.");
|
||||
const indexesByName = new Map<string, number[]>();
|
||||
columns.forEach((name, index) => {
|
||||
if (!name) return;
|
||||
const indexes = indexesByName.get(name) ?? [];
|
||||
indexes.push(index);
|
||||
indexesByName.set(name, indexes);
|
||||
});
|
||||
const used = new Set<number>();
|
||||
return selectedColumns.map((column) => {
|
||||
const index = indexesByName.get(column.name)?.[column.nameOccurrence];
|
||||
if (index === undefined) throw new Error(`Selected SQL export column was not found: ${column.name}`);
|
||||
if (used.has(index)) throw new Error(`SQL export column was selected more than once: ${column.name}`);
|
||||
used.add(index);
|
||||
return index;
|
||||
});
|
||||
}
|
||||
@@ -5,16 +5,28 @@ import i18n from "@/i18n";
|
||||
export type SqlInsertMode = "batch" | "single";
|
||||
export type SqlInsertDialect = "source" | "standard";
|
||||
|
||||
export interface SqlExportColumnSelection {
|
||||
sourceIndex: number;
|
||||
name: string;
|
||||
nameOccurrence: number;
|
||||
}
|
||||
|
||||
export interface SqlExportOptions {
|
||||
insertMode: SqlInsertMode;
|
||||
splitMaxMb?: number;
|
||||
selectedColumns?: SqlExportColumnSelection[];
|
||||
}
|
||||
|
||||
export const DEFAULT_SQL_INSERT_MODE: SqlInsertMode = "batch";
|
||||
export const DEFAULT_SQL_INSERT_DIALECT: SqlInsertDialect = "source";
|
||||
|
||||
export function showSqlInsertModeDialog(options: { allowSplit?: boolean } = {}): Promise<SqlExportOptions | null> {
|
||||
if (typeof document === "undefined") return Promise.resolve({ insertMode: DEFAULT_SQL_INSERT_MODE });
|
||||
export function showSqlInsertModeDialog(options: { allowSplit?: boolean; columns?: SqlExportColumnSelection[] } = {}): Promise<SqlExportOptions | null> {
|
||||
if (typeof document === "undefined") {
|
||||
return Promise.resolve({
|
||||
insertMode: DEFAULT_SQL_INSERT_MODE,
|
||||
...(options.columns ? { selectedColumns: [...options.columns] } : {}),
|
||||
});
|
||||
}
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const container = document.createElement("div");
|
||||
@@ -31,6 +43,7 @@ export function showSqlInsertModeDialog(options: { allowSplit?: boolean } = {}):
|
||||
app = createApp(SqlInsertModeDialog, {
|
||||
open: true,
|
||||
allowSplit: options.allowSplit === true,
|
||||
columns: options.columns,
|
||||
onConfirm: (options: SqlExportOptions) => finish(options),
|
||||
onCancel: () => finish(null),
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user