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。

feat(export): unify primary key modes for SQL copy and export

_Mr丶s ゛😁®994f520df1fb
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index bd1fa65e07..9836efcff5 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -337,7 +337,7 @@ import { eventTargetAllowsNativeClipboard, isPlainClipboardShortcut, readTextFro
import { claimDataGridPaste, claimDataGridSelectAll, clearDataGridClipboardCopy, parseDataGridClipboard, parseDataGridClipboardInBatches, planDataGridPaste } from "@/lib/dataGrid/dataGridClipboard";
import { parseInsertStatementPaste, parseInsertStatementPasteInBatches } from "@/lib/dataGrid/dataGridInsertPaste";
import { beginDataGridNativeSelectionBlock, finishDataGridNativeSelectionBlock } from "@/lib/dataGrid/dataGridNativeSelection";
-import { DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS, DATA_GRID_COPY_EXTRACTOR_IDS, DATA_GRID_DEFAULT_COPY_PREFERENCES, extractorUnavailableForDatabase, type DataGridCopyExtractorId, type DataGridCopyPreference } from "@/lib/dataGrid/dataGridCopyExtractor";
+import { DATA_GRID_COPY_EXTRACTOR_DESCRIPTORS, DATA_GRID_COPY_EXTRACTOR_IDS, DATA_GRID_DEFAULT_COPY_PREFERENCES, extractorUnavailableForDatabase, type DataGridCopyExtractorId, type DataGridCopyPreference, type DataGridPrimaryKeyMode } from "@/lib/dataGrid/dataGridCopyExtractor";
import { columnNamesForCopy } from "@/lib/dataGrid/dataGridColumnNameCopy";
import { DATA_GRID_ROW_NUM_WIDTH, dataGridRowNumberColumnWidth, resolveDataGridMaxRowNumber, useDataGridColumnResize } from "@/composables/useDataGridColumnResize";
import { createDataGridColumnStructureSignature } from "@/lib/dataGrid/dataGridColumnWidthState";
@@ -8846,7 +8846,13 @@ function copyExtractorLabel(extractor: DataGridCopyExtractorId): string {
function copyPreferenceLabel(preference: DataGridCopyPreference): string {
if (preference === "smart") return t("grid.copyExtractorSmart");
if (preference !== "sql-inserts") return copyExtractorLabel(preference);
- return t(settingsStore.editorSettings.dataGridExtractorOptions.sql.excludePrimaryKeysFromInsert ? "grid.copyExtractorSqlInsertsWithoutPrimaryKeys" : "grid.copyExtractorSqlInsertsWithPrimaryKeys");
+ return sqlInsertModeLabel(settingsStore.editorSettings.dataGridExtractorOptions.sql.primaryKeyMode);
+}
+
+function sqlInsertModeLabel(mode: DataGridPrimaryKeyMode): string {
+ if (mode === "exclude-all") return t("grid.copyExtractorSqlInsertsWithoutAllPrimaryKeys");
+ if (mode === "exclude-generated") return t("grid.copyExtractorSqlInsertsWithoutPrimaryKeys");
+ return t("grid.copyExtractorSqlInsertsWithPrimaryKeys");
}
const selectedCopyPreference = computed(() => settingsStore.editorSettings.dataGridCopyExtractor);
@@ -8875,11 +8881,11 @@ function setDefaultCopyPreference(value: string) {
});
}
-function sqlInsertExtractorOptions(excludePrimaryKeysFromInsert: boolean) {
+function sqlInsertExtractorOptions(primaryKeyMode: DataGridPrimaryKeyMode) {
const options = settingsStore.editorSettings.dataGridExtractorOptions;
return {
...options,
- sql: { ...options.sql, excludePrimaryKeysFromInsert },
+ sql: { ...options.sql, primaryKeyMode },
};
}
@@ -13241,11 +13247,11 @@ function buildExtractorContextItems(destination: "copy" | "export" = "copy"): Co
const selected = extractor === selectedCopyPreference.value;
const extractorItems: ContextMenuItem[] = [];
if (extractor === "sql-inserts") {
- for (const excludePrimaryKeysFromInsert of [false, true]) {
- if (destination === "copy" && selected && settingsStore.editorSettings.dataGridExtractorOptions.sql.excludePrimaryKeysFromInsert === excludePrimaryKeysFromInsert) continue;
- const options = sqlInsertExtractorOptions(excludePrimaryKeysFromInsert);
+ for (const primaryKeyMode of ["include", "exclude-generated", "exclude-all"] as const) {
+ if (destination === "copy" && selected && settingsStore.editorSettings.dataGridExtractorOptions.sql.primaryKeyMode === primaryKeyMode) continue;
+ const options = sqlInsertExtractorOptions(primaryKeyMode);
extractorItems.push({
- label: t(excludePrimaryKeysFromInsert ? "grid.copyExtractorSqlInsertsWithoutPrimaryKeys" : "grid.copyExtractorSqlInsertsWithPrimaryKeys"),
+ label: sqlInsertModeLabel(primaryKeyMode),
action: () => void (destination === "copy" ? copyWithExtractor(extractor, options) : exportWithExtractor(extractor, options)),
disabled: !canCopyWithExtractor(extractor, options),
});
@@ -13273,7 +13279,7 @@ function buildExtractorContextItems(destination: "copy" | "export" = "copy"): Co
function defaultCopyPreferenceContextItem(): ContextMenuItem {
const preference = selectedCopyPreference.value;
- const extractorOptions = preference === "sql-inserts" ? sqlInsertExtractorOptions(settingsStore.editorSettings.dataGridExtractorOptions.sql.excludePrimaryKeysFromInsert) : undefined;
+ const extractorOptions = preference === "sql-inserts" ? sqlInsertExtractorOptions(settingsStore.editorSettings.dataGridExtractorOptions.sql.primaryKeyMode) : undefined;
const disabled = preference === "smart" ? !canCopyWithExtractor("raw", extractorOptions) && !canCopyWithExtractor("tsv", extractorOptions) : !canCopyWithExtractor(preference, extractorOptions);
return {
label: defaultCopyPreferenceLabel.value,
diff --git a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
index 8485c3ded8..9ee7f7f8ab 100644
--- a/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
+++ b/apps/desktop/src/components/grid/DataGridExtractorDialog.vue
@@ -210,9 +210,17 @@ function save() {
<template v-if="isSql">
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.skipComputedColumns" @change="updateSql('skipComputedColumns', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorSkipComputed") }}</label>
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.skipGeneratedColumns" @change="updateSql('skipGeneratedColumns', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorSkipGenerated") }}</label>
- <label v-if="draftExtractor === 'sql-inserts'" class="flex items-center gap-2 text-sm"
- ><input type="checkbox" :checked="draftOptions.sql.excludePrimaryKeysFromInsert" @change="updateSql('excludePrimaryKeysFromInsert', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorExcludePrimaryKeys") }}</label
- >
+ <div v-if="draftExtractor === 'sql-inserts'" class="space-y-1.5">
+ <Label>{{ t("grid.copyExtractorExcludePrimaryKeys") }}</Label>
+ <Select :model-value="draftOptions.sql.primaryKeyMode" @update:model-value="updateSql('primaryKeyMode', $event as DataGridExtractorOptions['sql']['primaryKeyMode'])">
+ <SelectTrigger><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem value="include">{{ t("grid.copyExtractorSqlInsertsWithPrimaryKeys") }}</SelectItem>
+ <SelectItem value="exclude-generated">{{ t("grid.copyExtractorSqlInsertsWithoutPrimaryKeys") }}</SelectItem>
+ <SelectItem value="exclude-all">{{ t("grid.copyExtractorSqlInsertsWithoutAllPrimaryKeys") }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.includeDatabaseName" @change="updateSql('includeDatabaseName', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorIncludeDatabaseName") }}</label>
<div v-if="draftExtractor === 'sql-inserts'" class="space-y-1.5">
<label class="flex items-center gap-2 text-sm"><input type="checkbox" :checked="draftOptions.sql.quoteIdentifiers" @change="updateSql('quoteIdentifiers', ($event.target as HTMLInputElement).checked)" />{{ t("grid.copyExtractorQuoteIdentifiers") }}</label>
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
index 09e92d012f..922df3148b 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts
@@ -1022,7 +1022,7 @@ describe("useDataGridExport prepared row statements", () => {
const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[1]] };
const excludePrimaryKeys = {
...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
- sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, skipGeneratedColumns: false, excludePrimaryKeysFromInsert: true },
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, skipGeneratedColumns: false, primaryKeyMode: "exclude-generated" },
};
const state = createExportState(autoIncrementTable, ["id"], matrix, [1], undefined, undefined, [], excludePrimaryKeys);
@@ -1048,7 +1048,7 @@ describe("useDataGridExport prepared row statements", () => {
const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[1]] };
const excludePrimaryKeys = {
...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
- sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, excludePrimaryKeysFromInsert: true },
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-generated" },
};
const state = createExportState(serialTable, ["id"], matrix, [1], undefined, undefined, [], excludePrimaryKeys);
@@ -1103,7 +1103,7 @@ describe("useDataGridExport prepared row statements", () => {
expect(createExportState(table, ["created_at"], matrix, ["2026-09-30 10:00:00"]).canCopyWithExtractor("sql-inserts")).toBe(true);
});
- it("keeps a manually-assigned primary key insertable under primary-key exclusion", () => {
+ it("keeps INSERT enabled when generated-key exclusion preserves the only selected manual key", () => {
const compositeKeyTable: DataGridTableMeta = {
tableName: "daily_stats",
primaryKeys: ["id", "stat_date"],
@@ -1116,7 +1116,7 @@ describe("useDataGridExport prepared row statements", () => {
const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [1], columns: ["stat_date"], rows: [["2026-08-18"]] };
const excludePrimaryKeys = {
...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
- sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, skipGeneratedColumns: false, excludePrimaryKeysFromInsert: true },
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, skipGeneratedColumns: false, primaryKeyMode: "exclude-generated" },
};
const state = createExportState(compositeKeyTable, ["id", "stat_date", "name"], matrix, [1, "2026-08-18", "Ada"], undefined, undefined, [], excludePrimaryKeys);
@@ -1124,6 +1124,106 @@ describe("useDataGridExport prepared row statements", () => {
expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
});
+ it("disables INSERT when the all-primary-keys mode removes the only selected manual key", () => {
+ const table: DataGridTableMeta = {
+ tableName: "countries",
+ primaryKeys: ["code"],
+ columns: [{ name: "code", data_type: "varchar(2)", is_nullable: false, is_primary_key: true }],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["code"], rows: [["US"]] };
+ const options = {
+ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-all" },
+ };
+
+ const state = createExportState(table, ["code"], matrix, ["US"], undefined, undefined, [], options);
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(false);
+ });
+
+ it("keeps a case-distinct PostgreSQL column insertable when excluding a primary key", () => {
+ const table: DataGridTableMeta = {
+ tableName: "quoted_ids",
+ primaryKeys: ["ID"],
+ columns: [
+ { name: "ID", data_type: "text", is_nullable: false, is_primary_key: true },
+ { name: "id", data_type: "text", is_nullable: false },
+ ],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [1], columns: ["id"], rows: [["lowercase"]] };
+ const excludePrimaryKeys = {
+ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-all" },
+ };
+
+ const state = createExportState(table, ["ID", "id"], matrix, ["key", "lowercase"], undefined, undefined, [], excludePrimaryKeys, false, undefined, false, undefined, undefined, "postgres");
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
+ });
+
+ it("uses exact PostgreSQL primary-key names when column metadata is incomplete", () => {
+ const table: DataGridTableMeta = {
+ tableName: "quoted_ids",
+ primaryKeys: ["ID"],
+ columns: [{ name: "ID", data_type: "integer", is_nullable: false, is_primary_key: true, extra: "identity" }],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [["lowercase"]] };
+ const excludePrimaryKeys = {
+ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-generated" },
+ };
+
+ const state = createExportState(table, ["id"], matrix, ["lowercase"], undefined, undefined, [], excludePrimaryKeys, false, undefined, false, undefined, undefined, "postgres");
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
+ });
+
+ it("uses the exact column metadata for a case-distinct PostgreSQL identity primary key", () => {
+ const table: DataGridTableMeta = {
+ tableName: "quoted_ids",
+ primaryKeys: ["ID"],
+ columns: [
+ { name: "ID", data_type: "integer", is_nullable: false, is_primary_key: true, extra: "identity" },
+ { name: "id", data_type: "text", is_nullable: false },
+ ],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [1], columns: ["id"], rows: [["lowercase"]] };
+
+ const state = createExportState(table, ["ID", "id"], matrix, ["key", "lowercase"], undefined, undefined, [], DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, false, undefined, false, undefined, undefined, "postgres");
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
+ });
+
+ it("excludes a MySQL primary key when its listed name differs only by case", () => {
+ const table: DataGridTableMeta = {
+ tableName: "users",
+ primaryKeys: ["ID"],
+ columns: [{ name: "id", data_type: "int", is_nullable: false, is_primary_key: false }],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[1]] };
+ const excludePrimaryKeys = {
+ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-all" },
+ };
+
+ const state = createExportState(table, ["id"], matrix, [1], undefined, undefined, [], excludePrimaryKeys, false, undefined, false, undefined, undefined, "mysql");
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(false);
+ });
+
+ it("keeps a MySQL identity primary key when its listed name differs only by case", () => {
+ const table: DataGridTableMeta = {
+ tableName: "users",
+ primaryKeys: ["ID"],
+ columns: [{ name: "id", data_type: "int", is_nullable: false, is_primary_key: false, extra: "auto_increment" }],
+ };
+ const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[1]] };
+
+ const state = createExportState(table, ["id"], matrix, [1], undefined, undefined, [], DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, false, undefined, false, undefined, undefined, "mysql");
+
+ expect(state.canCopyWithExtractor("sql-inserts")).toBe(true);
+ });
+
it("keeps an auto-increment primary key when copying only the primary key column as INSERT", () => {
const autoIncrementTable: DataGridTableMeta = {
tableName: "users",
@@ -1149,11 +1249,11 @@ describe("useDataGridExport prepared row statements", () => {
const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[7]] };
const savedOptions = {
...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
- sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, excludePrimaryKeysFromInsert: true },
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-generated" },
};
const includePrimaryKeys = {
...savedOptions,
- sql: { ...savedOptions.sql, excludePrimaryKeysFromInsert: false },
+ sql: { ...savedOptions.sql, primaryKeyMode: "include" },
};
vi.mocked(extractDataGridSelection).mockResolvedValueOnce({
text: "INSERT INTO `users` (`id`) VALUES (7);",
@@ -1167,8 +1267,8 @@ describe("useDataGridExport prepared row statements", () => {
expect(state.canCopyWithExtractor("sql-inserts")).toBe(false);
expect(state.canCopyWithExtractor("sql-inserts", includePrimaryKeys)).toBe(true);
await expect(state.copyWithExtractor("sql-inserts", includePrimaryKeys)).resolves.toBe(true);
- expect(extractDataGridSelection).toHaveBeenCalledWith(expect.objectContaining({ options: expect.objectContaining({ sql: expect.objectContaining({ excludePrimaryKeysFromInsert: false }) }) }));
- expect(savedOptions.sql.excludePrimaryKeysFromInsert).toBe(true);
+ expect(extractDataGridSelection).toHaveBeenCalledWith(expect.objectContaining({ options: expect.objectContaining({ sql: expect.objectContaining({ primaryKeyMode: "include" }) }) }));
+ expect(savedOptions.sql.primaryKeyMode).toBe("exclude-generated");
});
it("sends only selected values for non-SQL extraction and marks column selections", async () => {
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.sqlColumns.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.sqlColumns.spec.ts
index 49f56b177b..3bd6f7b874 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.sqlColumns.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.sqlColumns.spec.ts
@@ -8,6 +8,7 @@ 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";
+import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS } from "@/lib/dataGrid/dataGridCopyExtractor";
const mocks = vi.hoisted(() => ({ native: true, toast: vi.fn() }));
vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => mocks.native }));
@@ -88,6 +89,34 @@ describe("SQL export column selection across entrypoints", () => {
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("excludes only the exact PostgreSQL primary-key spelling", async () => {
+ const names = ["ID", "id", "name"];
+ const choices = sqlExportColumnChoices(names);
+ const state = useDataGridExport(
+ createOptions({
+ allColumns: computed(() => names),
+ tableMeta: computed(() => ({
+ tableName: "users",
+ primaryKeys: ["id"],
+ columns: [
+ { name: "ID", data_type: "int", extra: "identity" },
+ { name: "id", data_type: "int", is_primary_key: true },
+ { name: "name", data_type: "text" },
+ ],
+ })),
+ extractorOptions: computed(() => ({
+ dsv: { columnSeparator: ",", rowSeparator: "\\n", quote: '"', quoteMode: "minimal", nullText: "", includeHeader: true, includeRowHeader: false },
+ sql: { skipComputedColumns: true, skipGeneratedColumns: true, insertMode: "merged", primaryKeyMode: "exclude-all", includeDatabaseName: false, quoteIdentifiers: true, temporalFormat: "native" },
+ json: { camelCaseFieldNames: false },
+ })),
+ }),
+ );
+
+ await state.exportSql();
+
+ expect(showSqlInsertModeDialog).toHaveBeenCalledWith({ allowSplit: false, columns: choices.filter((column) => column.name !== "id") });
+ });
+
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 });
@@ -96,6 +125,78 @@ describe("SQL export column selection across entrypoints", () => {
expect(api.startQueryResultExport).not.toHaveBeenCalled();
});
+ it.each([false, true])("keeps case-distinct generated metadata aligned in query exports (reverse=$reverse)", async (reverse) => {
+ const names = ["ID", "id", "name"];
+ const metadata = [
+ { name: "ID", data_type: "int", extra: "identity" },
+ { name: "id", data_type: "int", is_primary_key: true },
+ { name: "name", data_type: "text" },
+ ];
+ vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns: sqlExportColumnChoices(names) });
+ await useDataGridExport(
+ createOptions({
+ allColumns: computed(() => names),
+ allColumnTypes: computed(() => ["int", "int", "text"]),
+ tableMeta: computed(() => ({ tableName: "users", primaryKeys: ["id"], columns: reverse ? [...metadata].reverse() : metadata })),
+ extractorOptions: computed(() => ({ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-generated" } })),
+ }),
+ ).exportSql();
+ expect(api.startQueryResultExport).toHaveBeenCalledWith(expect.objectContaining({ exportColumnExtras: ["identity", null, null], primaryKeys: ["id"], primaryKeyMode: "exclude-generated", selectedColumns: sqlExportColumnChoices(names) }), expect.any(Function));
+ });
+
+ it.each(["page", "selected", "web"] as const)("does not re-exclude a projected case-distinct non-key in the %s fallback", async (scope) => {
+ const names = ["ID", "id", "name"];
+ const selectedColumns = sqlExportColumnChoices(names).filter((column) => column.name !== "id");
+ const items = [{ id: 7, sourceIndex: 0, data: [91, 1, "Ada"], isNew: false, isDeleted: false, isDirtyCol: [], status: "" }];
+ mocks.native = scope !== "web";
+ vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns });
+ const state = useDataGridExport(
+ createOptions({
+ columns: computed(() => names),
+ allColumns: computed(() => names),
+ sourceColumns: computed(() => names),
+ columnTypes: computed(() => ["int", "int", "text"]),
+ displayItems: computed(() => items),
+ getRowItem: () => items[0],
+ tableMeta: computed(() => ({
+ tableName: "users",
+ primaryKeys: ["id"],
+ columns: [
+ { name: "ID", data_type: "int" },
+ { name: "id", data_type: "int", is_primary_key: true },
+ { name: "name", data_type: "text" },
+ ],
+ })),
+ extractorOptions: computed(() => ({ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-all" } })),
+ fullExportResult: vi.fn(async () => ({ columns: names, column_types: ["int", "int", "text"], rows: [[91, 1, "Ada"]] }) as QueryResult),
+ }),
+ );
+ if (scope === "page") await state.exportCurrentPageSql();
+ else await state.exportSql(scope === "selected" ? [7] : undefined);
+ expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: ["ID", "name"], rows: [[91, "Ada"]], excludeColumns: undefined }));
+ expect(saveTextFile).toHaveBeenCalledOnce();
+ });
+
+ it.each([false, true])("keeps case-distinct metadata aligned in page exports (reverse=$reverse)", async (reverse) => {
+ const names = ["ID", "id", "name"];
+ const metadata = [
+ { name: "ID", data_type: "int", extra: "identity" },
+ { name: "id", data_type: "int", is_primary_key: true },
+ { name: "name", data_type: "text" },
+ ];
+ vi.mocked(showSqlInsertModeDialog).mockResolvedValue({ insertMode: "batch", selectedColumns: sqlExportColumnChoices(names) });
+ await useDataGridExport(
+ createOptions({
+ columns: computed(() => names),
+ sourceColumns: computed(() => names),
+ columnTypes: computed(() => ["int", "int", "text"]),
+ tableMeta: computed(() => ({ tableName: "users", primaryKeys: ["id"], columns: reverse ? [...metadata].reverse() : metadata })),
+ extractorOptions: computed(() => ({ ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode: "exclude-generated" } })),
+ }),
+ ).exportCurrentPageSql();
+ expect(formatSqlInsert).toHaveBeenCalledWith(expect.objectContaining({ columns: names, columnExtras: ["identity", null, null], excludeColumns: undefined }));
+ });
+
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();
diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts
index 9c824ff2e6..9f14bfbc1f 100644
--- a/apps/desktop/src/composables/useDataGridExport.ts
+++ b/apps/desktop/src/composables/useDataGridExport.ts
@@ -8,7 +8,7 @@ import { notifyExportComplete } from "@/lib/export/exportReveal";
import { dropsSchemaQualifier } from "@/lib/table/tableSelectSql";
import * as api from "@/lib/backend/api";
import { type CellSelectionMatrix, type CellSelectionRange, type SelectionData } from "@/lib/dataGrid/gridSelection";
-import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, type DataGridCopyExtractorId, type DataGridExtractRequest, type DataGridExtractorOptions } from "@/lib/dataGrid/dataGridCopyExtractor";
+import { DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS, type DataGridCopyExtractorId, type DataGridExtractRequest, type DataGridExtractorOptions, type DataGridPrimaryKeyMode } from "@/lib/dataGrid/dataGridCopyExtractor";
import { useToast } from "@/composables/useToast";
import { useExportTracker } from "@/composables/useExportTracker";
import { clipboardCellValue, type CellValue } from "@/lib/dataGrid/cellValue";
@@ -16,7 +16,7 @@ import { binaryCellClipboardText } from "@/lib/dataGrid/binaryCellDownload";
import { tryStartExclusiveActivation, type ActionActivationGuard } from "@/lib/connection/actionActivation";
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 { buildDataGridCopyInsertStatement, type DataGridColumnInfo, type DataGridCopyInsertMode, type DataGridTableMeta } from "@/lib/dataGrid/dataGridSql";
import { formatSqlInsert, formatTsv } from "@/lib/export/exportFormats";
import { showSqlInsertModeDialog, type SqlExportColumnSelection, type SqlExportOptions, type SqlInsertMode } from "@/lib/export/sqlInsertMode";
import { resolveSqlExportColumnIndexes, sqlExportColumnChoices } from "@/lib/export/sqlExportColumns";
@@ -661,7 +661,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
};
}
- async function buildCopyInsertStatement(data: CopyInsertData, excludePrimaryKeys: boolean, insertMode: DataGridCopyInsertMode): Promise<string | undefined> {
+ async function buildCopyInsertStatement(data: CopyInsertData, primaryKeyMode: DataGridPrimaryKeyMode, insertMode: DataGridCopyInsertMode): Promise<string | undefined> {
if (databaseType.value === "mongodb") {
return formatMongoCopyStatement(
buildMongoCopyInsertStatement({
@@ -670,7 +670,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
sourceColumns: data.sourceColumns,
rows: data.rows,
mongoDocuments: options.mongoDocuments?.value,
- excludePrimaryKeys,
+ excludePrimaryKeys: primaryKeyMode !== "include",
insertMode,
}),
);
@@ -683,7 +683,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
columnTypes: data.columnTypes,
sourceColumns: data.sourceColumns,
rows: data.rows.map((item) => item.data),
- excludePrimaryKeys,
+ primaryKeyMode,
insertMode,
});
}
@@ -768,9 +768,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
return targetedRows().filter((item) => !item.isNew && !item.isDraft && !item.isDeleted);
}
- function insertableCopyColumnCount(excludePrimaryKeys: boolean, copyColumns = effectiveColumns(sourceColumns.value, columns.value), extractorOptions?: DataGridExtractorOptions): number {
- const primaryKeySet = new Set((tableMeta.value?.primaryKeys ?? []).map(normalizeColumnName));
- return copyColumns.filter((column): column is string => !!column && !isCopyInsertOmittedColumn(databaseType.value, column, tableMeta.value, extractorOptions) && (!excludePrimaryKeys || !primaryKeySet.has(normalizeColumnName(column)) || !isAutoGeneratedColumn(column, tableMeta.value))).length;
+ function insertableCopyColumnCount(primaryKeyMode: DataGridPrimaryKeyMode, copyColumns = effectiveColumns(sourceColumns.value, columns.value), extractorOptions?: DataGridExtractorOptions): number {
+ return copyColumns.filter((column): column is string => {
+ if (!column || isCopyInsertOmittedColumn(databaseType.value, column, tableMeta.value, extractorOptions, copyColumns)) return false;
+ const isPrimaryKey = isPrimaryKeyColumn(databaseType.value, column, tableMeta.value, copyColumns);
+ if (!isPrimaryKey || primaryKeyMode === "include") return true;
+ return primaryKeyMode === "exclude-generated" ? !isAutoGeneratedColumn(databaseType.value, column, tableMeta.value) : false;
+ }).length;
}
async function buildMongoExtractorInsert(extractorOptions: DataGridExtractorOptions, rowLimit?: number): Promise<string | undefined> {
@@ -785,7 +789,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
: selectionInsertData();
if (!data) return undefined;
await yieldToMainThread();
- return buildCopyInsertStatement(rowLimit === undefined ? data : { ...data, rows: data.rows.slice(0, rowLimit) }, extractorOptions.sql.excludePrimaryKeysFromInsert, extractorOptions.sql.insertMode);
+ return buildCopyInsertStatement(rowLimit === undefined ? data : { ...data, rows: data.rows.slice(0, rowLimit) }, extractorOptions.sql.primaryKeyMode, extractorOptions.sql.insertMode);
}
function mongoUpdateColumnIndexes(request: DataGridExtractRequest): number[] {
@@ -872,7 +876,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
copyText,
canCopySqlInsert: (request) => {
const selectedColumns = request.selectedColumnIndexes.map((index) => request.columns[index]?.sourceName ?? request.columns[index]?.displayName).filter((column): column is string => !!column);
- return request.rows.length > 0 && insertableCopyColumnCount(request.options.sql.excludePrimaryKeysFromInsert, selectedColumns, request.options) > 0;
+ return request.rows.length > 0 && insertableCopyColumnCount(request.options.sql.primaryKeyMode, selectedColumns, request.options) > 0;
},
buildMongoInsert: buildMongoExtractorInsert,
buildMongoUpdate: buildMongoExtractorUpdate,
@@ -1407,16 +1411,15 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
await exportResultSheetsXlsxResult(undefined, true);
}
- /**
- * SQL 导出需要排除的主键列:跟随数据提取设置里的“排除主键”,与
- * copy-as-INSERT (e3d5d1418) 一致只剔除自增/identity 主键,手动赋值的
- * 主键保留,否则回放 INSERT 会缺值;只有拿得到表元数据时才生效。
- */
- function sqlExportExcludedColumns(): string[] | undefined {
- if (!extractorOptionsOption?.value?.sql.excludePrimaryKeysFromInsert) return undefined;
+ /** SQL 文件导出与 SQL INSERT 复制共用同一主键处理模式。 */
+ function sqlExportExcludedColumns(columnNames?: readonly string[]): string[] | undefined {
+ const mode = extractorOptionsOption?.value?.sql.primaryKeyMode ?? "include";
+ if (mode === "include") return undefined;
const primaryKeys = tableMeta.value?.primaryKeys ?? [];
- const autoGenerated = primaryKeys.filter((column) => isAutoGeneratedColumn(column, tableMeta.value));
- return autoGenerated.length > 0 ? autoGenerated : undefined;
+ const excluded = mode === "exclude-all" ? primaryKeys : primaryKeys.filter((column) => isAutoGeneratedColumn(databaseType.value, column, tableMeta.value));
+ const knownColumns = tableMeta.value?.columns?.length ? tableMeta.value.columns.map((column) => column.name) : allColumns.value;
+ const projectedExcluded = columnNames ? columnNames.filter((column) => isSqlExportPrimaryKeyExcluded(databaseType.value, column, knownColumns, excluded)) : excluded;
+ return projectedExcluded.length > 0 ? projectedExcluded : undefined;
}
/**
@@ -1427,7 +1430,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
function sqlExportColumnExtras(columnNames: string[]): Array<string | null> | undefined {
const metaColumns = tableMeta.value?.columns;
if (!metaColumns?.length) return undefined;
- const extras = columnNames.map((column) => metaColumns.find((meta) => normalizeColumnName(meta.name) === normalizeColumnName(column))?.extra ?? null);
+ const extras = columnNames.map((column) => findCopyColumnInfo(databaseType.value, column, tableMeta.value)?.extra ?? null);
return extras.some((extra) => !!extra) ? extras : undefined;
}
@@ -1445,10 +1448,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
return meta?.tableName || (context.value === "results" ? "query_result" : "table_name");
}
- /** 供导出请求使用:把“不含主键”设置转换成后端请求字段。 */
- function sqlExportPrimaryKeyOptions(): { excludePrimaryKeys?: boolean; primaryKeys?: string[] } {
- const excludeColumns = sqlExportExcludedColumns();
- return excludeColumns ? { excludePrimaryKeys: true, primaryKeys: excludeColumns } : {};
+ /** 供 SQL 导出请求传递共享的主键模式和原表主键列表。 */
+ function sqlExportPrimaryKeyOptions(format: string): { primaryKeyMode?: DataGridPrimaryKeyMode; primaryKeys?: string[] } {
+ if (format !== "sql") return {};
+ return {
+ primaryKeyMode: extractorOptionsOption?.value?.sql.primaryKeyMode ?? "include",
+ ...(tableMeta.value?.primaryKeys ? { primaryKeys: tableMeta.value.primaryKeys } : {}),
+ };
}
async function exportFullTableDataViaBackend(format: "csv" | "xlsx" | "json" | "markdown" | "sql" | "txt", rowIds?: number[], headerMode: XlsxHeaderMode = "name", autoFilter = true, sqlExportOptions?: SqlExportOptions, openAfterExport = false, columnIndexes?: number[]): Promise<boolean> {
@@ -1529,7 +1535,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
columnComments: format === "xlsx" ? buildXlsxHeaderOverrides(columns.value, visibleXlsxColumnComments.value, headerMode) : undefined,
headerCommentRows: format === "xlsx" ? xlsxHeaderUsesCommentRows(headerMode) : undefined,
primaryKeys: meta.primaryKeys,
- ...sqlExportPrimaryKeyOptions(),
+ ...sqlExportPrimaryKeyOptions(format),
whereInput: whereInput.value,
orderBy: orderBy.value,
skipCount: false,
@@ -1622,7 +1628,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
...(format === "sql" ? { selectedColumns: sqlExportOptions?.selectedColumns } : {}),
csvQuoteMode: useSettingsStore().editorSettings.csvQuoteMode,
nullLiteral: csvNullLiteralForMode(useSettingsStore().editorSettings.csvNullMode),
- ...sqlExportPrimaryKeyOptions(),
+ ...sqlExportPrimaryKeyOptions(format),
dateTimeFormat: useSettingsStore().editorSettings.globalDateTimeExportFormat || undefined,
numericColumnRightAlign: useSettingsStore().editorSettings.numericColumnRightAlign ?? true,
columnComments,
@@ -1710,7 +1716,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
function sqlExportChoices(fullResult: boolean, columnSubset?: readonly string[]): SqlExportColumnSelection[] {
const names = columnSubset ?? (context.value === "table-data" ? effectiveColumns(sourceColumns.value, columns.value) : fullResult ? allColumns.value : columns.value);
- const excluded = new Set((sqlExportExcludedColumns() ?? []).map(normalizeColumnName));
+ const excluded = sqlExportExcludedColumns() ?? [];
const types = fullResult && context.value === "results" ? allColumnTypes.value : columnTypes.value;
// A subset's sourceIndex is its position within the subset; resolve the
// metadata-less type fallback by name against the typed column list.
@@ -1718,7 +1724,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
const typeByName = columnSubset ? new Map(typeNames.map((name, index) => [name, types?.[index]])) : undefined;
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;
+ if (isSqlExportPrimaryKeyExcluded(databaseType.value, column.name, names, excluded) || 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 || (columnSubset ? typeByName?.get(column.name) : types?.[column.sourceIndex]))?.trim().replace(/^"|"$/g, "").toLowerCase();
@@ -1818,7 +1824,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
spatialValues: exportData.spatialValues,
rows: exportData.rows,
insertMode,
- excludeColumns: sqlExportExcludedColumns(),
+ excludeColumns: sqlExportExcludedColumns(exportData.columns),
});
logExportStage(
"sql-build-done",
@@ -1865,7 +1871,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
spatialValues: exportData.spatialValues,
rows: exportData.rows,
insertMode,
- excludeColumns: sqlExportExcludedColumns(),
+ excludeColumns: sqlExportExcludedColumns(exportData.columns),
});
const saved = await saveTextFile(content, exportFileName("export-page", "sql", { page: true }), "SQL", "sql");
if (!saved) return;
@@ -1899,7 +1905,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
.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 exportColumnExtras = metaColumns?.length ? exportColumns.map((column) => (column ? (findCopyColumnInfo(databaseType.value, column, tableMeta.value)?.extra ?? null) : null)) : undefined;
// SQL Server 的结果集列类型来自 TDS:rowversion 会报成 varbinary/binary,据此无法识别不可插入列;
// 表元数据(sys.columns)里才是 "timestamp"。与数据库级导出链同口径,SQL Server 的 INSERT 载荷
// 优先用表元数据类型、缺元数据时回退结果集类型(其它引擎维持结果集类型优先)。
@@ -2011,16 +2017,16 @@ function effectiveColumns(sourceColumns: Array<string | undefined> | undefined,
return sourceColumns;
}
-function isAutoGeneratedColumn(column: string, tableMeta: DataGridTableMeta | undefined): boolean {
- const columnInfo = tableMeta?.columns?.find((item) => normalizeColumnName(item.name) === normalizeColumnName(column));
+function isAutoGeneratedColumn(databaseType: DatabaseType | undefined, column: string, tableMeta: DataGridTableMeta | undefined): boolean {
+ const columnInfo = findCopyColumnInfo(databaseType, column, tableMeta);
const extra = columnInfo?.extra?.toLowerCase() ?? "";
const defaultValue = columnInfo?.column_default?.toLowerCase() ?? "";
return /\b(auto_increment|autoincrement|identity|smallserial|serial|bigserial)\b/.test(extra) || /\bnextval\s*\(/.test(defaultValue);
}
-function isCopyInsertOmittedColumn(databaseType: DatabaseType | undefined, column: string, tableMeta: DataGridTableMeta | undefined, extractorOptions?: DataGridExtractorOptions): boolean {
+function isCopyInsertOmittedColumn(databaseType: DatabaseType | undefined, column: string, tableMeta: DataGridTableMeta | undefined, extractorOptions?: DataGridExtractorOptions, knownColumns: (string | undefined)[] = [column]): boolean {
if (usesSyntheticRowIdKey(databaseType, [column])) return true;
- const columnInfo = tableMeta?.columns?.find((item) => normalizeColumnName(item.name) === normalizeColumnName(column));
+ const columnInfo = findCopyColumnInfo(databaseType, column, tableMeta);
const normalizedType = columnInfo?.data_type.trim().replace(/^"|"$/g, "").toLowerCase();
if (databaseType === "postgres" && (normalizedType === "tsvector" || normalizedType?.endsWith(".tsvector"))) return true;
// SQL Server 的 timestamp/rowversion 是服务端计数器(TDS 上即 binary(8)),永远不能显式插入;
@@ -2028,13 +2034,48 @@ function isCopyInsertOmittedColumn(databaseType: DatabaseType | undefined, colum
const baseType = normalizedType?.split("(")[0]?.trim();
if (databaseType === "sqlserver" && (baseType === "timestamp" || baseType === "rowversion")) return true;
const extra = columnInfo?.extra?.toLowerCase() ?? "";
- const isAutoGenerated = isAutoGeneratedColumn(column, tableMeta);
+ const isAutoGenerated = isAutoGeneratedColumn(databaseType, column, tableMeta);
// SQL Server 计算列的 extra 是裸字符串 "computed"(sys.columns),与其它方言的 generated 关键字同样受「跳过计算列」开关控制。
const isComputed = (extra.includes("generated always as") || (databaseType === "sqlserver" && extra.trim() === "computed")) && !extra.includes("identity");
- const isPrimaryKey = (tableMeta?.primaryKeys ?? []).some((key) => normalizeColumnName(key) === normalizeColumnName(column));
+ const isPrimaryKey = isPrimaryKeyColumn(databaseType, column, tableMeta, knownColumns);
return ((extractorOptions?.sql.skipGeneratedColumns ?? true) && isAutoGenerated && !isPrimaryKey) || ((extractorOptions?.sql.skipComputedColumns ?? true) && isComputed);
}
+function findCopyColumnInfo(databaseType: DatabaseType | undefined, column: string, tableMeta: DataGridTableMeta | undefined): DataGridColumnInfo | undefined {
+ const metadata = tableMeta?.columns ?? [];
+ const exact = metadata.find((item) => item.name === column);
+ if (exact) return exact;
+ if (databaseType === "postgres" || databaseType === "redshift") return undefined;
+ const matches = metadata.filter((item) => normalizeColumnName(item.name) === normalizeColumnName(column));
+ return matches.length === 1 ? matches[0] : undefined;
+}
+
+function isPrimaryKeyColumn(databaseType: DatabaseType | undefined, column: string, tableMeta: DataGridTableMeta | undefined, knownColumns: (string | undefined)[]): boolean {
+ const primaryKeys = tableMeta?.primaryKeys ?? [];
+ if (primaryKeys.includes(column)) return true;
+
+ const normalized = normalizeColumnName(column);
+ const metadataMatches = (tableMeta?.columns ?? []).filter((item) => normalizeColumnName(item.name) === normalized);
+ const exactMetadata = metadataMatches.find((item) => item.name === column);
+ if (exactMetadata?.is_primary_key) return true;
+ if (databaseType === "postgres" || databaseType === "redshift") return false;
+ if (metadataMatches.length === 1) {
+ return (metadataMatches[0].is_primary_key ?? false) || primaryKeys.filter((key) => normalizeColumnName(key) === normalized).length === 1;
+ }
+ if (metadataMatches.length > 1) return false;
+
+ const visibleSpellings = new Set(knownColumns.filter((name): name is string => !!name && normalizeColumnName(name) === normalized));
+ if (visibleSpellings.size > 1) return false;
+ return primaryKeys.filter((key) => normalizeColumnName(key) === normalized).length === 1;
+}
+
function normalizeColumnName(name: string): string {
return name.toUpperCase();
}
+
+function isSqlExportPrimaryKeyExcluded(databaseType: DatabaseType | undefined, column: string, columns: readonly (string | undefined)[], excludedPrimaryKeys: readonly string[]): boolean {
+ if (excludedPrimaryKeys.includes(column)) return true;
+ if (databaseType === "postgres" || databaseType === "redshift") return false;
+ const normalized = normalizeColumnName(column);
+ return columns.filter((name): name is string => !!name && normalizeColumnName(name) === normalized).length === 1 && excludedPrimaryKeys.filter((key) => normalizeColumnName(key) === normalized).length === 1;
+}
diff --git a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
index 65de957cbc..f29fc5f7ff 100644
--- a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
@@ -545,7 +545,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
headerCommentRows: format === "xlsx" ? xlsxHeaderUsesCommentRows(headerMode) : undefined,
autoFilter: format === "xlsx" ? autoFilter : undefined,
primaryKeys,
- excludePrimaryKeys: settingsStore.editorSettings.dataGridExtractorOptions.sql.excludePrimaryKeysFromInsert === true,
+ primaryKeyMode: settingsStore.editorSettings.dataGridExtractorOptions.sql.primaryKeyMode,
batchSize: target.batchSize,
skipCount: format === "sql",
rowLimit: target.rowLimit,
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index a0598139eb..3e678b6552 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -1825,7 +1825,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN siyahısı",
copyExtractorSqlInserts: "SQL INSERT əmrləri",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT əmrləri (əsas açarlarla)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT əmrləri (əsas açarlarsız)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT əmrləri (avtomatik yaradılan əsas açarlarsız)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT əmrləri (heç bir əsas açar olmadan)",
copyExtractorSqlUpdates: "SQL UPDATE əmrləri",
copyExtractorSqlSelect: "SQL SELECT",
copyExtractorWhereClause: "WHERE ifadəsi",
@@ -1847,7 +1848,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Sətir nömrələrini daxil et",
copyExtractorSkipComputed: "Hesablanan sütunları ötür",
copyExtractorSkipGenerated: "Avtomatik yaradılan sütunları ötür",
- copyExtractorExcludePrimaryKeys: "Əsas açarları istisna et",
+ copyExtractorExcludePrimaryKeys: "Əsas açarların işlənməsi",
copyExtractorIncludeDatabaseName: "Verilənlər bazasının adını daxil et",
copyExtractorInsertMode: "INSERT əmrləri",
copyExtractorInsertMerged: "Sətirləri birləşdir",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 7c03a0200e..d6a32c0069 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2281,7 +2281,8 @@ export default {
copyExtractorSqlInList: "SQL IN List",
copyExtractorSqlInserts: "SQL Inserts",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL Inserts (with Primary Keys)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Inserts (without Primary Keys)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Inserts (without Generated Primary Keys)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL Inserts (without Any Primary Keys)",
copyExtractorSqlUpdates: "SQL Updates",
copyExtractorSqlSelect: "SQL Select",
copyExtractorWhereClause: "Where Clause",
@@ -2303,7 +2304,7 @@ export default {
copyExtractorIncludeRowHeader: "Include row numbers",
copyExtractorSkipComputed: "Skip computed columns",
copyExtractorSkipGenerated: "Skip generated columns",
- copyExtractorExcludePrimaryKeys: "Exclude primary keys",
+ copyExtractorExcludePrimaryKeys: "Primary key handling",
copyExtractorIncludeDatabaseName: "Include database name",
copyExtractorQuoteIdentifiers: "Quote table and column names",
copyExtractorTemporalFormat: "Date and time values",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 0e6fe7e2ca..802e113eb7 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2895,7 +2895,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "Lista SQL IN",
copyExtractorSqlInserts: "Sentencias SQL INSERT",
copyExtractorSqlInsertsWithPrimaryKeys: "Sentencias SQL INSERT (con claves primarias)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "Sentencias SQL INSERT (sin claves primarias)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "Sentencias SQL INSERT (sin claves primarias generadas)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "Sentencias SQL INSERT (sin ninguna clave primaria)",
copyExtractorSqlUpdates: "Sentencias SQL UPDATE",
copyExtractorSqlSelect: "Sentencia SQL SELECT",
copyExtractorWhereClause: "Cláusula WHERE",
@@ -2917,7 +2918,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Incluir números de fila",
copyExtractorSkipComputed: "Saltar columnas calculadas",
copyExtractorSkipGenerated: "Saltar columnas generadas",
- copyExtractorExcludePrimaryKeys: "Excluir claves primarias",
+ copyExtractorExcludePrimaryKeys: "Tratamiento de claves primarias",
copyExtractorIncludeDatabaseName: "Incluir el nombre de la base de datos",
copyExtractorInsertMode: "Modo de sentencia INSERT",
copyExtractorInsertMerged: "Combinar varias filas",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index d47c0027bb..1d4e42ff08 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -2121,7 +2121,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "Daftar IN SQL",
copyExtractorSqlInserts: "SQL Insert",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL Insert (dengan Kunci Utama)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Insert (tanpa Kunci Utama)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Insert (tanpa Kunci Utama yang Dibuat Otomatis)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL Insert (tanpa Kunci Utama Apa Pun)",
copyExtractorSqlUpdates: "SQL Update",
copyExtractorSqlSelect: "SQL Select",
copyExtractorWhereClause: "Klausa Where",
@@ -2143,7 +2144,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Sertakan nomor baris",
copyExtractorSkipComputed: "Lewati kolom hasil hitungan",
copyExtractorSkipGenerated: "Lewati kolom generated",
- copyExtractorExcludePrimaryKeys: "Kecualikan kunci utama",
+ copyExtractorExcludePrimaryKeys: "Penanganan kunci utama",
copyExtractorIncludeDatabaseName: "Sertakan nama database",
copyExtractorInsertMode: "Pernyataan INSERT",
copyExtractorInsertMerged: "Gabungkan baris",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index fe1a626a70..1df6e2f5a8 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2768,7 +2768,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "Lista SQL IN",
copyExtractorSqlInserts: "Istruzioni SQL INSERT",
copyExtractorSqlInsertsWithPrimaryKeys: "Istruzioni SQL INSERT (con chiavi primarie)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "Istruzioni SQL INSERT (senza chiavi primarie)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "Istruzioni SQL INSERT (senza chiavi primarie generate)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "Istruzioni SQL INSERT (senza alcuna chiave primaria)",
copyExtractorSqlUpdates: "Istruzioni SQL UPDATE",
copyExtractorSqlSelect: "Istruzione SQL SELECT",
copyExtractorWhereClause: "Clausola WHERE",
@@ -2790,7 +2791,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Includi numeri riga",
copyExtractorSkipComputed: "Salta colonne calcolate",
copyExtractorSkipGenerated: "Salta colonne generate",
- copyExtractorExcludePrimaryKeys: "Escludi chiavi primarie",
+ copyExtractorExcludePrimaryKeys: "Gestione delle chiavi primarie",
copyExtractorIncludeDatabaseName: "Includi il nome del database",
copyExtractorInsertMode: "Modalità istruzione INSERT",
copyExtractorInsertMerged: "Unisci più righe",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index e8360fa87e..0c7af30821 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2787,7 +2787,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN リスト",
copyExtractorSqlInserts: "SQL INSERT 文",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT 文(主キーを含む)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 文(主キーを除外)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 文(自動生成された主キーを除外)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT 文(すべての主キーを除外)",
copyExtractorSqlUpdates: "SQL UPDATE 文",
copyExtractorSqlSelect: "SQL SELECT 文",
copyExtractorWhereClause: "WHERE 条件",
@@ -2809,7 +2810,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "行番号を含む",
copyExtractorSkipComputed: "計算列をスキップ",
copyExtractorSkipGenerated: "生成列をスキップ",
- copyExtractorExcludePrimaryKeys: "主キーを除外",
+ copyExtractorExcludePrimaryKeys: "主キーの扱い",
copyExtractorIncludeDatabaseName: "データベース名を含める",
copyExtractorInsertMode: "INSERT文モード",
copyExtractorInsertMerged: "複数行をマージ",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 45730e6f4f..d4e2f40c3b 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -2095,7 +2095,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN 목록",
copyExtractorSqlInserts: "SQL INSERT",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT (기본 키 포함)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT (기본 키 제외)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT (자동 생성 기본 키 제외)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT (모든 기본 키 제외)",
copyExtractorSqlUpdates: "SQL UPDATE",
copyExtractorSqlSelect: "SQL SELECT",
copyExtractorWhereClause: "WHERE 절",
@@ -2117,7 +2118,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "행 번호 포함",
copyExtractorSkipComputed: "계산된 컬럼 건너뛰기",
copyExtractorSkipGenerated: "생성된 컬럼 건너뛰기",
- copyExtractorExcludePrimaryKeys: "기본 키 제외",
+ copyExtractorExcludePrimaryKeys: "기본 키 처리 방식",
copyExtractorIncludeDatabaseName: "데이터베이스 이름 포함",
copyExtractorInsertMode: "INSERT 구문",
copyExtractorInsertMerged: "행 병합",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 3bd0c6412f..baba8b1237 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2768,7 +2768,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "Lista SQL IN",
copyExtractorSqlInserts: "Instruções SQL INSERT",
copyExtractorSqlInsertsWithPrimaryKeys: "Instruções SQL INSERT (com chaves primárias)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "Instruções SQL INSERT (sem chaves primárias)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "Instruções SQL INSERT (sem chaves primárias geradas)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "Instruções SQL INSERT (sem nenhuma chave primária)",
copyExtractorSqlUpdates: "Instruções SQL UPDATE",
copyExtractorSqlSelect: "Instrução SQL SELECT",
copyExtractorWhereClause: "Condição WHERE",
@@ -2790,7 +2791,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Incluir números de linha",
copyExtractorSkipComputed: "Pular colunas computadas",
copyExtractorSkipGenerated: "Pular colunas geradas",
- copyExtractorExcludePrimaryKeys: "Excluir chaves primárias",
+ copyExtractorExcludePrimaryKeys: "Tratamento das chaves primárias",
copyExtractorIncludeDatabaseName: "Incluir nome do banco de dados",
copyExtractorInsertMode: "Modo de instrução INSERT",
copyExtractorInsertMerged: "Mesclar várias linhas",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 389afb4dce..9802ddfc92 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2184,7 +2184,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "Список SQL IN",
copyExtractorSqlInserts: "SQL INSERT",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT (с первичными ключами)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT (без первичных ключей)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT (без сгенерированных первичных ключей)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT (без любых первичных ключей)",
copyExtractorSqlUpdates: "SQL UPDATE",
copyExtractorSqlSelect: "SQL SELECT",
copyExtractorWhereClause: "Условие WHERE",
@@ -2206,7 +2207,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Включить номера строк",
copyExtractorSkipComputed: "Пропускать вычисляемые столбцы",
copyExtractorSkipGenerated: "Пропускать генерируемые столбцы",
- copyExtractorExcludePrimaryKeys: "Исключить первичные ключи",
+ copyExtractorExcludePrimaryKeys: "Обработка первичных ключей",
copyExtractorIncludeDatabaseName: "Включить имя базы данных",
copyExtractorInsertMode: "Операторы INSERT",
copyExtractorInsertMerged: "Объединять строки",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index cc15d5cd7c..aceff7653e 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -1824,7 +1824,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN Listesi",
copyExtractorSqlInserts: "SQL Insert",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL Insert (Birincil Anahtarlarla)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Insert (Birincil Anahtarlar Olmadan)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL Insert (Otomatik Oluşturulan Birincil Anahtarlar Olmadan)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL Insert (Hiçbir Birincil Anahtar Olmadan)",
copyExtractorSqlUpdates: "SQL Update",
copyExtractorSqlSelect: "SQL Select",
copyExtractorWhereClause: "Where Yan Tümcesi",
@@ -1846,7 +1847,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "Satır numaralarını dâhil et",
copyExtractorSkipComputed: "Hesaplanan sütunları atla",
copyExtractorSkipGenerated: "Üretilen sütunları atla",
- copyExtractorExcludePrimaryKeys: "Birincil anahtarları hariç tut",
+ copyExtractorExcludePrimaryKeys: "Birincil anahtar işleme biçimi",
copyExtractorIncludeDatabaseName: "Veritabanı adını dahil et",
copyExtractorInsertMode: "INSERT ifadeleri",
copyExtractorInsertMerged: "Satırları birleştir",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index f9d31d072f..b9ef121c28 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2215,7 +2215,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN 列表",
copyExtractorSqlInserts: "SQL INSERT 语句",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT 语句(含主键)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 语句(不含主键)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 语句(不含自动生成主键)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT 语句(不含任何主键)",
copyExtractorSqlUpdates: "SQL UPDATE 语句",
copyExtractorSqlSelect: "SQL SELECT 语句",
copyExtractorWhereClause: "WHERE 条件",
@@ -2237,7 +2238,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "包含行号",
copyExtractorSkipComputed: "跳过计算列",
copyExtractorSkipGenerated: "跳过生成列",
- copyExtractorExcludePrimaryKeys: "排除主键",
+ copyExtractorExcludePrimaryKeys: "主键处理方式",
copyExtractorIncludeDatabaseName: "包含数据库名称",
copyExtractorQuoteIdentifiers: "表名和字段名加引号",
copyExtractorTemporalFormat: "日期和时间值",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 8ed1be6318..f34eaab44e 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2773,7 +2773,8 @@ export default withEnglishFallback({
copyExtractorSqlInList: "SQL IN 列表",
copyExtractorSqlInserts: "SQL INSERT 語句",
copyExtractorSqlInsertsWithPrimaryKeys: "SQL INSERT 語句(含主鍵)",
- copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 語句(不含主鍵)",
+ copyExtractorSqlInsertsWithoutPrimaryKeys: "SQL INSERT 語句(不含自動產生的主鍵)",
+ copyExtractorSqlInsertsWithoutAllPrimaryKeys: "SQL INSERT 語句(不含任何主鍵)",
copyExtractorSqlUpdates: "SQL UPDATE 語句",
copyExtractorSqlSelect: "SQL SELECT 語句",
copyExtractorWhereClause: "WHERE 條件",
@@ -2795,7 +2796,7 @@ export default withEnglishFallback({
copyExtractorIncludeRowHeader: "包含行號",
copyExtractorSkipComputed: "跳過計算列",
copyExtractorSkipGenerated: "跳過生成列",
- copyExtractorExcludePrimaryKeys: "排除主鍵",
+ copyExtractorExcludePrimaryKeys: "主鍵處理方式",
copyExtractorIncludeDatabaseName: "包含資料庫名稱",
copyExtractorQuoteIdentifiers: "資料表名稱和欄位名稱加引號",
copyExtractorTemporalFormat: "日期和時間值",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
index a719b41485..c5112d415f 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridCopyExtractor.spec.ts
@@ -12,6 +12,12 @@ describe("data-grid extractor options", () => {
expect(normalizeDataGridExtractorOptions({ sql: { quoteIdentifiers: "false", temporalFormat: "custom" } }).sql).toMatchObject({ quoteIdentifiers: true, temporalFormat: "native" });
});
+ it("migrates the legacy primary-key flag and normalizes the explicit mode", () => {
+ expect(normalizeDataGridExtractorOptions({}).sql.primaryKeyMode).toBe("include");
+ expect(normalizeDataGridExtractorOptions({ sql: { excludePrimaryKeysFromInsert: true } }).sql.primaryKeyMode).toBe("exclude-generated");
+ expect(normalizeDataGridExtractorOptions({ sql: { primaryKeyMode: "exclude-all" } }).sql.primaryKeyMode).toBe("exclude-all");
+ });
+
it("defaults to dropping database qualification and keeps an explicit opt-in", () => {
expect(DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql.includeDatabaseName).toBe(false);
expect(normalizeDataGridExtractorOptions({ sql: {} }).sql.includeDatabaseName).toBe(false);
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index 71e91d8f27..c2c36ced6e 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -6232,8 +6232,8 @@ export interface TableExportRequest {
/** xlsx 专用:注释作为第二行表头(第 1 行列名、第 2 行注释、数据从第 3 行开始)。 */
headerCommentRows?: boolean;
primaryKeys?: string[];
- /** 导出 SQL 时是否排除主键列(对应数据提取设置里的“排除主键”)。 */
- excludePrimaryKeys?: boolean;
+ /** SQL INSERT 导出使用的数据提取器主键模式。 */
+ primaryKeyMode?: "include" | "exclude-generated" | "exclude-all";
whereInput?: string;
orderBy?: string;
skipCount?: boolean;
@@ -6317,8 +6317,8 @@ export interface QueryResultExportRequest {
headerCommentRows?: boolean;
autoFilter?: boolean;
identifierQuote?: string;
- /** 导出 SQL 时是否排除主键列(对应数据提取设置里的“排除主键”)。 */
- excludePrimaryKeys?: boolean;
+ /** SQL INSERT 导出使用的数据提取器主键模式。 */
+ primaryKeyMode?: "include" | "exclude-generated" | "exclude-all";
/** 结果集对应的原表主键列名,由前端从表元数据带入。 */
primaryKeys?: string[];
}
diff --git a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
index 909f1acfe2..8107715a4b 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridCopyExtractor.ts
@@ -84,13 +84,15 @@ export interface DataGridDsvOptions {
includeRowHeader: boolean;
}
+export type DataGridPrimaryKeyMode = "include" | "exclude-generated" | "exclude-all";
+
export interface DataGridExtractorOptions {
dsv: DataGridDsvOptions;
sql: {
skipComputedColumns: boolean;
skipGeneratedColumns: boolean;
insertMode: DataGridCopyInsertMode;
- excludePrimaryKeysFromInsert: boolean;
+ primaryKeyMode: DataGridPrimaryKeyMode;
includeDatabaseName: boolean;
quoteIdentifiers: boolean;
temporalFormat: "native" | "string";
@@ -155,7 +157,7 @@ export const DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS: DataGridExtractorOptions = {
skipComputedColumns: true,
skipGeneratedColumns: true,
insertMode: "merged",
- excludePrimaryKeysFromInsert: false,
+ primaryKeyMode: "include",
includeDatabaseName: false,
quoteIdentifiers: true,
temporalFormat: "native",
@@ -170,7 +172,7 @@ function unicodeCodePointLength(value: string): number {
export function normalizeDataGridExtractorOptions(value: unknown): DataGridExtractorOptions {
const source = typeof value === "object" && value !== null ? (value as Partial<DataGridExtractorOptions>) : {};
const dsv: Partial<DataGridDsvOptions> = typeof source.dsv === "object" && source.dsv !== null ? source.dsv : {};
- const sql: Partial<DataGridExtractorOptions["sql"]> = typeof source.sql === "object" && source.sql !== null ? source.sql : {};
+ const sql: Record<string, unknown> = typeof source.sql === "object" && source.sql !== null ? (source.sql as Record<string, unknown>) : {};
const json: Partial<DataGridExtractorOptions["json"]> = typeof source.json === "object" && source.json !== null ? source.json : {};
const separator = (candidate: unknown, fallback: string) => (typeof candidate === "string" && unicodeCodePointLength(candidate) > 0 && unicodeCodePointLength(candidate) <= 8 ? candidate : fallback);
const quote = typeof dsv.quote === "string" && unicodeCodePointLength(dsv.quote) === 1 ? dsv.quote : DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.dsv.quote;
@@ -188,7 +190,7 @@ export function normalizeDataGridExtractorOptions(value: unknown): DataGridExtra
skipComputedColumns: sql.skipComputedColumns !== false,
skipGeneratedColumns: sql.skipGeneratedColumns !== false,
insertMode: sql.insertMode === "row-by-row" ? "row-by-row" : "merged",
- excludePrimaryKeysFromInsert: sql.excludePrimaryKeysFromInsert === true,
+ primaryKeyMode: sql.primaryKeyMode === "exclude-generated" || sql.primaryKeyMode === "exclude-all" || sql.primaryKeyMode === "include" ? sql.primaryKeyMode : sql.excludePrimaryKeysFromInsert === true ? "exclude-generated" : "include",
includeDatabaseName: sql.includeDatabaseName === true,
quoteIdentifiers: sql.quoteIdentifiers !== false,
temporalFormat: sql.temporalFormat === "string" ? "string" : "native",
diff --git a/apps/desktop/src/lib/dataGrid/dataGridSql.ts b/apps/desktop/src/lib/dataGrid/dataGridSql.ts
index eec126d63b..73e635f0ae 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridSql.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridSql.ts
@@ -59,7 +59,7 @@ export interface DataGridCopyInsertStatementOptions {
columnTypes?: Array<string | null | undefined>;
sourceColumns?: Array<string | undefined>;
rows: GridCellValue[][];
- excludePrimaryKeys?: boolean;
+ primaryKeyMode?: "include" | "exclude-generated" | "exclude-all";
includeComputedColumns?: boolean;
includeDatabaseName?: boolean;
insertMode?: DataGridCopyInsertMode;
diff --git a/crates/dbx-core/src/data/database_export.rs b/crates/dbx-core/src/data/database_export.rs
index 8dff9691ea..5f919d00b0 100644
--- a/crates/dbx-core/src/data/database_export.rs
+++ b/crates/dbx-core/src/data/database_export.rs
@@ -12,6 +12,7 @@ use flate2::write::GzEncoder;
use flate2::Compression;
use crate::connection::task_client_session_id;
+use crate::data_grid_sql::{extra_is_auto_generated, DataGridPrimaryKeyMode};
use crate::models::connection::DatabaseType;
use crate::mysql_ddl_normalize::DdlNormalizeOptions;
use crate::object_source_sql::build_export_object_source_sql;
@@ -1445,8 +1446,7 @@ pub(crate) fn build_export_insert_statements_excluding_with_dialect(
if options.columns.is_empty() || options.rows.is_empty() {
return Ok(Vec::new());
}
- let excluded_names: HashSet<String> =
- exclude_columns.iter().map(|column| column.trim().to_ascii_uppercase()).collect();
+ let excluded_names: HashSet<&str> = exclude_columns.iter().map(|column| column.trim()).collect();
let table = export_qualified_table_name(
options.database_type,
options.schema.as_deref(),
@@ -1463,7 +1463,19 @@ pub(crate) fn build_export_insert_statements_excluding_with_dialect(
.enumerate()
.filter_map(|(index, column)| {
let column_type = export_column_type(&options.column_types, index, options.database_type, &spatial_columns);
- let excluded = excluded_names.contains(&column.trim().to_ascii_uppercase());
+ let column_name = column.trim();
+ let excluded = excluded_names.contains(column_name)
+ || (exclude_columns
+ .iter()
+ .filter(|excluded| excluded.trim().eq_ignore_ascii_case(column_name))
+ .count()
+ == 1
+ && options
+ .columns
+ .iter()
+ .filter(|candidate| candidate.trim().eq_ignore_ascii_case(column_name))
+ .count()
+ == 1);
(is_export_insert_column(
options.database_type,
column,
@@ -1662,6 +1674,43 @@ fn export_sql_statement_bytes(database_type: Option<DatabaseType>, text: &str) -
}
}
+pub(crate) fn sql_export_excluded_primary_keys(
+ database_type: Option<DatabaseType>,
+ mode: DataGridPrimaryKeyMode,
+ primary_keys: &[String],
+ columns: &[String],
+ column_extras: &[Option<String>],
+) -> Vec<String> {
+ match mode {
+ DataGridPrimaryKeyMode::Include => Vec::new(),
+ DataGridPrimaryKeyMode::ExcludeAll | DataGridPrimaryKeyMode::ExcludeGenerated => primary_keys
+ .iter()
+ .filter_map(|key| sql_export_column_index(database_type, key, columns))
+ .filter(|index| {
+ mode == DataGridPrimaryKeyMode::ExcludeAll
+ || column_extras.get(*index).and_then(|extra| extra.as_deref()).is_some_and(extra_is_auto_generated)
+ })
+ .map(|index| columns[index].clone())
+ .collect(),
+ }
+}
+
+pub(crate) fn sql_export_column_index(
+ database_type: Option<DatabaseType>,
+ name: &str,
+ columns: &[String],
+) -> Option<usize> {
+ if let Some(index) = columns.iter().position(|column| column == name) {
+ return Some(index);
+ }
+ if matches!(database_type, Some(DatabaseType::Postgres | DatabaseType::Redshift)) {
+ return None;
+ }
+ let mut matches = columns.iter().enumerate().filter(|(_, column)| column.eq_ignore_ascii_case(name));
+ let index = matches.next()?.0;
+ matches.next().is_none().then_some(index)
+}
+
pub(crate) fn is_internal_export_column(database_type: Option<DatabaseType>, column: &str) -> bool {
// Synthetic ROWID is injected only to identify editable rows. It is not a
// physical table column and must never propagate into exports.
@@ -1714,6 +1763,15 @@ impl SqlExportProjection {
self.entries.iter().map(|(_, request_index)| values.get(*request_index).cloned().unwrap_or_default()).collect()
}
+ pub(crate) fn project_excluded_columns(&self, columns: &[String], exclude_columns: &[String]) -> Vec<String> {
+ self.entries
+ .iter()
+ .filter_map(|(index, _)| columns.get(*index))
+ .filter(|column| exclude_columns.contains(column))
+ .cloned()
+ .collect()
+ }
+
pub(crate) fn project_owned<T: Default>(&self, mut values: Vec<T>) -> Vec<T> {
self.entries.iter().map(|(index, _)| values.get_mut(*index).map(std::mem::take).unwrap_or_default()).collect()
}
@@ -7209,6 +7267,31 @@ mod tests {
);
}
+ #[test]
+ fn sql_insert_export_excludes_only_the_exact_case_sensitive_column() {
+ let statements = build_export_insert_statements_excluding(
+ BuildExportInsertStatementsOptions {
+ database_type: Some(DatabaseType::Postgres),
+ identifier_quote: None,
+ schema: Some("public".to_string()),
+ table_name: Some("users".to_string()),
+ qualified_table_name: None,
+ columns: vec!["ID".to_string(), "id".to_string(), "name".to_string()],
+ column_types: vec![Some("integer".to_string()), Some("integer".to_string()), Some("text".to_string())],
+ column_extras: Vec::new(),
+ spatial_columns: Vec::new(),
+ spatial_values: Vec::new(),
+ rows: vec![vec![json!(1), json!(2), json!("Ada")]],
+ batch_size: Some(10),
+ preserve_original_language: false,
+ },
+ &["id".to_string()],
+ )
+ .unwrap();
+
+ assert_eq!(statements, vec!["INSERT INTO \"public\".\"users\" (\"ID\", \"name\") VALUES (1, 'Ada');"]);
+ }
+
#[test]
fn sql_insert_export_allows_explicitly_excluded_opaque_column() {
let statements = build_export_insert_statements_excluding(
diff --git a/crates/dbx-core/src/data/query_result_export.rs b/crates/dbx-core/src/data/query_result_export.rs
index 72aa3ed825..8f68bfe627 100644
--- a/crates/dbx-core/src/data/query_result_export.rs
+++ b/crates/dbx-core/src/data/query_result_export.rs
@@ -14,10 +14,11 @@ use crate::csv_export::{
csv_null_literal, format_query_result_csv_with_options, format_tsv, push_query_result_csv_row_with_options,
push_tsv_row, CsvQuoteMode,
};
+use crate::data_grid_sql::DataGridPrimaryKeyMode;
pub use crate::database_export::ExportStatus;
use crate::database_export::{
- build_export_insert_statements_excluding, is_export_cancelled, BuildExportInsertStatementsOptions,
- SqlExportProjection, SqlInsertMode,
+ build_export_insert_statements_excluding, is_export_cancelled, sql_export_column_index,
+ sql_export_excluded_primary_keys, BuildExportInsertStatementsOptions, SqlExportProjection, SqlInsertMode,
};
use crate::models::connection::DatabaseType;
use crate::query::{
@@ -148,9 +149,9 @@ pub struct QueryResultExportRequest {
pub auto_filter: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub identifier_quote: Option<String>,
- /// 导出 SQL 时是否排除主键列(对应前端数据提取设置里的“排除主键”)。
+ /// SQL INSERT 导出使用的数据提取器主键模式。
#[serde(default)]
- pub exclude_primary_keys: bool,
+ pub primary_key_mode: DataGridPrimaryKeyMode,
/// 结果集对应的原表主键列名。查询结果导出由前端从表元数据带过来;
/// 没有表元数据(例如自由 SQL 查询)时为空,此时无法排除主键。
#[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -485,7 +486,7 @@ impl SqlInsertWriter {
table_name,
identifier_quote: request.identifier_quote.clone(),
projection: None,
- exclude_columns: if request.exclude_primary_keys { request.primary_keys.clone() } else { Vec::new() },
+ exclude_columns: Vec::new(),
})
}
@@ -514,6 +515,19 @@ impl SqlInsertWriter {
self.column_extras = projection.project_request(request.export_column_extras.as_deref().unwrap_or_default());
self.spatial_columns = projection.project_spatial_columns(spatial_columns);
self.columns = projection.project(&columns);
+ let primary_keys = request
+ .primary_keys
+ .iter()
+ .filter_map(|key| sql_export_column_index(Some(request.database_type), key, &columns))
+ .map(|index| columns[index].clone())
+ .collect::<Vec<_>>();
+ self.exclude_columns = sql_export_excluded_primary_keys(
+ Some(request.database_type),
+ request.primary_key_mode,
+ &projection.project_excluded_columns(&columns, &primary_keys),
+ &self.columns,
+ &self.column_extras,
+ );
self.projection = request.selected_columns.as_ref().map(|_| projection);
Ok(())
}
@@ -2214,6 +2228,54 @@ mod tests {
use super::*;
use serde_json::json;
+ #[test]
+ fn query_sql_export_primary_key_modes_distinguish_generated_and_manual_keys() {
+ let keys = vec!["id".to_string(), "stat_date".to_string()];
+ let columns = vec!["id".to_string(), "stat_date".to_string()];
+ let extras = vec![Some("identity".to_string()), None];
+
+ assert_eq!(
+ sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::ExcludeGenerated,
+ &keys,
+ &columns,
+ &extras,
+ ),
+ vec!["id"]
+ );
+ assert_eq!(
+ sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::ExcludeAll,
+ &keys,
+ &columns,
+ &extras,
+ ),
+ keys
+ );
+ assert!(sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::Include,
+ &keys,
+ &columns,
+ &extras
+ )
+ .is_empty());
+ }
+
+ #[test]
+ fn query_generated_key_export_matches_case_distinct_column_names_exactly() {
+ assert!(sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::ExcludeGenerated,
+ &["id".to_string()],
+ &["ID".to_string(), "id".to_string()],
+ &[Some("identity".to_string()), None],
+ )
+ .is_empty());
+ }
+
#[test]
fn export_column_remap_follows_column_names_across_pages() {
// Elasticsearch-style page drift: the second page reports `beta` where the
@@ -2330,7 +2392,7 @@ mod tests {
insert_mode: SqlInsertMode::Batch,
csv_quote_mode: Default::default(),
null_literal: String::new(),
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
}
}
@@ -2385,7 +2447,7 @@ mod tests {
}
#[test]
- fn sql_insert_writer_omits_excluded_primary_key_columns() {
+ fn sql_insert_writer_excludes_all_primary_keys_in_all_keys_mode() {
let dir = tempfile::tempdir().expect("temp dir");
let file_path = dir.path().join("users.sql");
let request = QueryResultExportRequest {
@@ -2424,7 +2486,7 @@ mod tests {
insert_mode: Default::default(),
csv_quote_mode: Default::default(),
null_literal: String::new(),
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
primary_keys: vec!["id".to_string()],
};
@@ -2446,6 +2508,71 @@ mod tests {
);
}
+ #[test]
+ fn sql_insert_writer_keeps_projected_case_distinct_non_primary_key() {
+ let dir = tempfile::tempdir().expect("temp dir");
+ let file_path = dir.path().join("users.sql");
+ let mut request = sqlserver_identity_export_request(&file_path, None);
+ request.database_type = DatabaseType::Postgres;
+ request.export_schema = Some("public".into());
+ request.export_table_name = Some("users".into());
+ request.export_column_types = None;
+ request.primary_keys = vec!["id".into()];
+ request.primary_key_mode = DataGridPrimaryKeyMode::ExcludeAll;
+ request.selected_columns = Some(vec![
+ crate::types::SqlExportColumnSelection { source_index: 0, name: "ID".into(), name_occurrence: 0 },
+ crate::types::SqlExportColumnSelection { source_index: 2, name: "name".into(), name_occurrence: 0 },
+ ]);
+
+ let mut writer = SqlInsertWriter::create(&request).expect("create SQL writer");
+ writer
+ .set_columns(
+ vec!["ID".into(), "id".into(), "name".into()],
+ &["integer".into(), "integer".into(), "text".into()],
+ &[],
+ &request,
+ )
+ .expect("set SQL export columns");
+ writer.write_row(vec![json!(91), json!(1), json!("Ada")], None).expect("write row");
+ writer.finish().expect("finish export");
+
+ assert_eq!(
+ std::fs::read_to_string(&file_path).expect("read SQL export"),
+ "INSERT INTO \"public\".\"users\" (\"ID\", \"name\") VALUES (91, 'Ada');\n"
+ );
+ }
+
+ #[test]
+ fn sql_insert_writer_keeps_manual_key_with_case_distinct_identity_metadata() {
+ let dir = tempfile::tempdir().expect("temp dir");
+ let file_path = dir.path().join("users.sql");
+ let mut request =
+ sqlserver_identity_export_request(&file_path, Some(vec![Some("identity".into()), None, None]));
+ request.database_type = DatabaseType::Postgres;
+ request.export_schema = Some("public".into());
+ request.export_table_name = Some("users".into());
+ request.export_column_types = None;
+ request.primary_keys = vec!["id".into()];
+ request.primary_key_mode = DataGridPrimaryKeyMode::ExcludeGenerated;
+
+ let mut writer = SqlInsertWriter::create(&request).expect("create SQL writer");
+ writer
+ .set_columns(
+ vec!["ID".into(), "id".into(), "name".into()],
+ &["integer".into(), "integer".into(), "text".into()],
+ &[],
+ &request,
+ )
+ .expect("set SQL export columns");
+ writer.write_row(vec![json!(91), json!(1), json!("Ada")], None).expect("write row");
+ writer.finish().expect("finish export");
+
+ assert_eq!(
+ std::fs::read_to_string(&file_path).expect("read SQL export"),
+ "INSERT INTO \"public\".\"users\" (\"ID\", \"id\", \"name\") VALUES (91, 1, 'Ada');\n"
+ );
+ }
+
#[test]
fn postgres_temp_setup_accepts_only_session_local_table_operations() {
let safe = vec![
@@ -2512,7 +2639,7 @@ mod tests {
auto_filter: None,
header_comment_rows: false,
identifier_quote: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
}
}
diff --git a/crates/dbx-core/src/data/table_export.rs b/crates/dbx-core/src/data/table_export.rs
index 6c28684c1e..5daf0dbc96 100644
--- a/crates/dbx-core/src/data/table_export.rs
+++ b/crates/dbx-core/src/data/table_export.rs
@@ -18,11 +18,12 @@ use crate::csv_export::{
csv_null_literal, format_csv_with_options, format_tsv, push_table_csv_row, push_table_csv_row_with_options,
push_tsv_row, CsvQuoteMode,
};
-use crate::data_grid_sql::extra_is_auto_generated;
+use crate::data_grid_sql::DataGridPrimaryKeyMode;
pub use crate::database_export::ExportStatus;
use crate::database_export::{
build_export_insert_statements_excluding_with_dialect, is_export_cancelled, is_internal_export_column,
- BuildExportInsertStatementsOptions, SqlExportProjection, SqlInsertDialect, SqlInsertMode,
+ sql_export_excluded_primary_keys, BuildExportInsertStatementsOptions, SqlExportProjection, SqlInsertDialect,
+ SqlInsertMode,
};
use crate::db::agent_driver::AgentTableReadStartParams;
use crate::models::connection::DatabaseType;
@@ -43,31 +44,6 @@ pub fn table_export_client_session_id(export_id: &str) -> String {
task_client_session_id("table-export", export_id)
}
-/// SQL 导出时需要排除的列名:用户选择了“不含主键”时,与 copy-as-INSERT
-/// 一致只剔除自增/identity 主键;手动赋值的主键保留,否则回放 INSERT 缺值。
-fn sql_export_excluded_columns(
- request: &TableExportRequest,
- primary_keys: &[String],
- col_names: &[String],
- column_extras: &[Option<String>],
-) -> Vec<String> {
- if !request.exclude_primary_keys {
- return Vec::new();
- }
- primary_keys
- .iter()
- .filter(|pk| {
- col_names
- .iter()
- .position(|name| name.eq_ignore_ascii_case(pk))
- .and_then(|index| column_extras.get(index))
- .and_then(|extra| extra.as_deref())
- .is_some_and(extra_is_auto_generated)
- })
- .cloned()
- .collect()
-}
-
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct TableExportRequest {
@@ -105,9 +81,9 @@ pub struct TableExportRequest {
pub column_extras: Option<Vec<Option<String>>>,
#[serde(default)]
pub primary_keys: Option<Vec<String>>,
- /// 导出 SQL 时是否排除主键列(对应前端数据提取设置里的“排除主键”)。
+ /// SQL INSERT 导出使用的数据提取器主键模式。
#[serde(default)]
- pub exclude_primary_keys: bool,
+ pub primary_key_mode: DataGridPrimaryKeyMode,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub where_input: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -1493,7 +1469,16 @@ async fn try_export_native_table_stream(
batch_size: Some(request.insert_mode.batch_size(SQL_INSERT_BATCH_SIZE)),
preserve_original_language: false,
}),
- &sql_export_excluded_columns(request, primary_keys, col_names, column_extras),
+ &projection.project_excluded_columns(
+ col_names,
+ &sql_export_excluded_primary_keys(
+ Some(*db_type),
+ request.primary_key_mode,
+ primary_keys,
+ col_names,
+ column_extras,
+ ),
+ ),
request.insert_dialect,
)?;
write_sql_export_statements(file, statements, &mut wrote_statements)?;
@@ -2353,7 +2338,16 @@ async fn export_table_data_core_inner(
batch_size: Some(request.insert_mode.batch_size(SQL_INSERT_BATCH_SIZE)),
preserve_original_language: false,
}),
- &sql_export_excluded_columns(request, &primary_keys, &col_names, &column_extras),
+ &projection.project_excluded_columns(
+ &col_names,
+ &sql_export_excluded_primary_keys(
+ Some(db_type),
+ request.primary_key_mode,
+ &primary_keys,
+ &col_names,
+ &column_extras,
+ ),
+ ),
request.insert_dialect,
)?;
write_sql_export_statements(&mut file, statements, &mut wrote_statements)?;
@@ -2421,6 +2415,125 @@ mod tests {
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;
+ #[test]
+ fn sql_export_primary_key_modes_keep_manual_keys_or_exclude_all_keys() {
+ let primary_keys = vec!["id".to_string(), "stat_date".to_string()];
+ let columns = vec!["id".to_string(), "stat_date".to_string()];
+ let extras = vec![Some("auto_increment".to_string()), None];
+
+ assert_eq!(
+ sql_export_excluded_primary_keys(
+ Some(DatabaseType::Mysql),
+ DataGridPrimaryKeyMode::ExcludeGenerated,
+ &primary_keys,
+ &columns,
+ &extras,
+ ),
+ vec!["id"]
+ );
+ assert_eq!(
+ sql_export_excluded_primary_keys(
+ Some(DatabaseType::Mysql),
+ DataGridPrimaryKeyMode::ExcludeAll,
+ &primary_keys,
+ &columns,
+ &extras,
+ ),
+ primary_keys
+ );
+ assert!(sql_export_excluded_primary_keys(
+ Some(DatabaseType::Mysql),
+ DataGridPrimaryKeyMode::Include,
+ &primary_keys,
+ &columns,
+ &extras
+ )
+ .is_empty());
+ }
+
+ #[test]
+ fn generated_key_export_matches_case_distinct_column_names_exactly() {
+ assert!(sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::ExcludeGenerated,
+ &["id".to_string()],
+ &["ID".to_string(), "id".to_string()],
+ &[Some("identity".to_string()), None],
+ )
+ .is_empty());
+ }
+
+ #[test]
+ fn sql_export_primary_key_exclusions_resolve_before_projection() {
+ let columns = vec!["ID".into(), "id".into(), "name".into()];
+ let projection = SqlExportProjection::resolve(
+ &columns,
+ Some(&[
+ crate::types::SqlExportColumnSelection { source_index: 0, name: "ID".into(), name_occurrence: 0 },
+ crate::types::SqlExportColumnSelection { source_index: 2, name: "name".into(), name_occurrence: 0 },
+ ]),
+ )
+ .unwrap();
+ let excluded = sql_export_excluded_primary_keys(
+ Some(DatabaseType::Postgres),
+ DataGridPrimaryKeyMode::ExcludeAll,
+ &["id".into()],
+ &columns,
+ &[],
+ );
+ let statements = build_export_insert_statements_excluding_with_dialect(
+ projection.project_insert_options(BuildExportInsertStatementsOptions {
+ database_type: Some(DatabaseType::Postgres),
+ identifier_quote: None,
+ schema: Some("public".into()),
+ table_name: Some("users".into()),
+ qualified_table_name: None,
+ columns: columns.clone(),
+ column_types: vec![Some("integer".into()), Some("integer".into()), Some("text".into())],
+ column_extras: Vec::new(),
+ spatial_columns: Vec::new(),
+ spatial_values: Vec::new(),
+ rows: vec![vec![json!(91), json!(1), json!("Ada")]],
+ batch_size: Some(100),
+ preserve_original_language: false,
+ }),
+ &projection.project_excluded_columns(&columns, &excluded),
+ SqlInsertDialect::Source,
+ )
+ .unwrap();
+ let dir = tempfile::tempdir().unwrap();
+ let output = dir.path().join("users.sql");
+ let mut writer = TableExportSqlWriter::Plain(std::io::BufWriter::new(std::fs::File::create(&output).unwrap()));
+ write_sql_export_statements(&mut writer, statements, &mut false).unwrap();
+ writer.finish("users.sql").unwrap();
+ assert_eq!(
+ std::fs::read_to_string(&output).unwrap(),
+ "INSERT INTO \"public\".\"users\" (\"ID\", \"name\") VALUES (91, 'Ada');"
+ );
+ }
+
+ #[test]
+ fn sql_export_primary_key_exclusions_preserve_unique_case_fallback() {
+ assert_eq!(
+ sql_export_excluded_primary_keys(
+ Some(DatabaseType::Mysql),
+ DataGridPrimaryKeyMode::ExcludeAll,
+ &["ID".into()],
+ &["id".into(), "name".into()],
+ &[],
+ ),
+ vec!["id"]
+ );
+ assert!(sql_export_excluded_primary_keys(
+ Some(DatabaseType::Mysql),
+ DataGridPrimaryKeyMode::ExcludeAll,
+ &["Id".into()],
+ &["id".into(), "ID".into()],
+ &[],
+ )
+ .is_empty());
+ }
+
#[test]
fn split_zip_sql_export_writes_batch_statements_separately() {
let dir = tempfile::tempdir().unwrap();
@@ -2587,7 +2700,7 @@ mod tests {
column_types: Some(vec![Some("INTEGER".to_string()), Some("VARCHAR".to_string())]),
column_extras: None,
primary_keys: Some(vec!["id".to_string()]),
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count,
@@ -2754,7 +2867,7 @@ mod tests {
insert_dialect: Default::default(),
csv_quote_mode: CsvQuoteMode::All,
null_literal: String::new(),
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
columns: None,
selected_columns: None,
column_types: None,
@@ -2930,7 +3043,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: Some("WHERE temperature > 1".to_string()),
order_by: Some("Time DESC".to_string()),
skip_count: true,
@@ -2998,7 +3111,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3042,7 +3155,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3081,7 +3194,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3128,7 +3241,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3187,7 +3300,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: Some("WHERE status = 'active'".to_string()),
order_by: None,
skip_count: false,
@@ -3240,7 +3353,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: false,
@@ -3321,7 +3434,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: false,
@@ -3384,7 +3497,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3449,7 +3562,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: false,
@@ -3508,7 +3621,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
@@ -3554,7 +3667,7 @@ mod tests {
column_types: None,
column_extras: None,
primary_keys: None,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
where_input: None,
order_by: None,
skip_count: true,
diff --git a/crates/dbx-core/tests/live_clickhouse_query_result_export.rs b/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
index e69bfa677e..c28ede7ffa 100644
--- a/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
+++ b/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
@@ -114,7 +114,7 @@ async fn live_clickhouse_query_result_export_xlsx_streams_random_order_query_onc
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let done_seen = AtomicBool::new(false);
diff --git a/crates/dbx-core/tests/live_mysql57.rs b/crates/dbx-core/tests/live_mysql57.rs
index 74c933889f..a477d9de4d 100644
--- a/crates/dbx-core/tests/live_mysql57.rs
+++ b/crates/dbx-core/tests/live_mysql57.rs
@@ -489,7 +489,7 @@ async fn live_mysql_query_result_export_xlsx_streams_single_query_without_duplic
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let done_seen = AtomicBool::new(false);
@@ -588,7 +588,7 @@ async fn live_mysql_csv_temporal_export_round_trip_preserves_dbx_force_text_valu
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
export_query_result_core(&state, &request, None, |_| {}).await.expect("export fixture");
@@ -711,7 +711,7 @@ async fn live_mysql_xlsx_export_can_outlive_query_timeout_while_rows_keep_arrivi
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let rows_exported = AtomicU64::new(0);
diff --git a/crates/dbx-core/tests/live_postgres_query_result_export.rs b/crates/dbx-core/tests/live_postgres_query_result_export.rs
index f997bd656b..150484e73b 100644
--- a/crates/dbx-core/tests/live_postgres_query_result_export.rs
+++ b/crates/dbx-core/tests/live_postgres_query_result_export.rs
@@ -166,7 +166,7 @@ async fn live_postgres_query_result_export_uses_single_streamed_query() {
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let done_seen = AtomicBool::new(false);
@@ -258,7 +258,7 @@ async fn live_postgres_query_result_xlsx_preserves_temporal_cell_types() {
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
@@ -339,7 +339,7 @@ async fn live_postgres_numeric_xlsx_ignores_fractional_trailing_zeros() {
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: true,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
@@ -425,7 +425,7 @@ async fn live_postgres_truncated_batch_result_export_replays_safe_temp_setup() {
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let csv_rows = AtomicU64::new(0);
@@ -515,7 +515,7 @@ async fn live_postgres_xlsx_export_can_outlive_query_timeout_while_rows_keep_arr
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let rows_exported = AtomicU64::new(0);
@@ -594,7 +594,7 @@ async fn live_postgres_stream_still_times_out_without_progress_and_recovers() {
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let started_at = Instant::now();
diff --git a/crates/dbx-core/tests/live_postgres_tsvector.rs b/crates/dbx-core/tests/live_postgres_tsvector.rs
index 3e5cd92638..697bd8db3b 100644
--- a/crates/dbx-core/tests/live_postgres_tsvector.rs
+++ b/crates/dbx-core/tests/live_postgres_tsvector.rs
@@ -76,7 +76,7 @@ async fn postgres_tsvector_generated_columns_are_readable_and_omitted_from_inser
column_types: None,
source_columns: None,
rows: result.rows.clone(),
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
diff --git a/crates/dbx-core/tests/live_sqlserver_completion.rs b/crates/dbx-core/tests/live_sqlserver_completion.rs
index 904bd8b480..4a97e80b8b 100644
--- a/crates/dbx-core/tests/live_sqlserver_completion.rs
+++ b/crates/dbx-core/tests/live_sqlserver_completion.rs
@@ -1237,7 +1237,7 @@ async fn live_sqlserver_query_result_export_streams_cte_query_to_csv() {
header_comment_rows: false,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let done_seen = AtomicBool::new(false);
diff --git a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
index 2a8d1ba42a..3a56397615 100644
--- a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
+++ b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
@@ -145,7 +145,7 @@ async fn live_sqlserver_xlsx_export_can_outlive_query_timeout_while_rows_keep_ar
auto_filter: None,
identifier_quote: None,
numeric_column_right_align: false,
- exclude_primary_keys: false,
+ primary_key_mode: dbx_core::data_grid_sql::DataGridPrimaryKeyMode::Include,
primary_keys: Vec::new(),
};
let rows_exported = AtomicU64::new(0);
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs b/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
index 0c14087868..b3c3a99897 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/contract.rs
@@ -1,4 +1,4 @@
-use crate::data_grid_sql::{DataGridCopyInsertMode, DataGridTableMeta};
+use crate::data_grid_sql::{DataGridCopyInsertMode, DataGridPrimaryKeyMode, DataGridTableMeta};
use crate::models::connection::DatabaseType;
use serde::{Deserialize, Serialize};
use serde_json::Value;
@@ -93,7 +93,7 @@ pub struct DataGridSqlExtractorOptions {
pub skip_computed_columns: bool,
pub skip_generated_columns: bool,
pub insert_mode: DataGridCopyInsertMode,
- pub exclude_primary_keys_from_insert: bool,
+ pub primary_key_mode: DataGridPrimaryKeyMode,
pub include_database_name: bool,
pub quote_identifiers: bool,
pub temporal_format: DataGridTemporalFormat,
@@ -105,7 +105,7 @@ impl Default for DataGridSqlExtractorOptions {
skip_computed_columns: DEFAULT_SQL_SKIP_COMPUTED_COLUMNS,
skip_generated_columns: DEFAULT_SQL_SKIP_GENERATED_COLUMNS,
insert_mode: DataGridCopyInsertMode::Merged,
- exclude_primary_keys_from_insert: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_database_name: true,
quote_identifiers: true,
temporal_format: DataGridTemporalFormat::Native,
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
index 258d0e1450..2189bb8017 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/mod.rs
@@ -9,6 +9,7 @@ mod json;
mod raw;
mod sql;
+use crate::data_grid_sql::unique_column_info_match;
pub use contract::*;
use delimited::{write_dsv, write_one_row};
use document::{write_html, write_markdown, write_pretty, write_xml};
@@ -136,22 +137,13 @@ fn build_context(request: &DataGridExtractRequest) -> Result<ExtractContext<'_>,
})?;
}
}
- let column_info_by_name = request
- .table_meta
- .as_ref()
- .and_then(|table_meta| table_meta.columns.as_ref())
- .map(|columns| {
- columns
- .iter()
- .map(|info| (normalized_name(info.name.as_str()).to_ascii_uppercase(), info))
- .collect::<std::collections::HashMap<_, _>>()
- })
- .unwrap_or_default();
+ let column_info =
+ request.table_meta.as_ref().and_then(|table_meta| table_meta.columns.as_deref()).unwrap_or_default();
let selected_column_info = selected_columns
.iter()
.map(|column| {
let source_name = column.source_name.as_deref().unwrap_or(&column.display_name);
- column_info_by_name.get(&normalized_name(source_name).to_ascii_uppercase()).copied()
+ unique_column_info_match(request.database_type, column_info, source_name)
})
.collect();
Ok(ExtractContext { request, selected_columns, selected_source_indexes, selected_column_info })
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/sql.rs b/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
index 9f0c4b84aa..a6d09e600b 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/sql.rs
@@ -7,8 +7,8 @@ use crate::data_grid_sql::{
build_column_predicate, build_data_grid_copy_insert_statement_with_formatters,
build_data_grid_copy_update_statements, data_grid_generated_table_name, format_grid_copy_insert_sql_literal,
format_grid_sql_literal_with_identifier_quote, is_auto_generated_column, is_grid_insert_omitted_column,
- is_non_identity_generated_column, supports_relational_copy_predicates, DataGridColumnInfo,
- DataGridCopyInsertStatementOptions, DataGridCopyUpdateStatementOptions, DataGridTableMeta,
+ is_non_identity_generated_column, is_primary_key_column, supports_relational_copy_predicates, DataGridColumnInfo,
+ DataGridCopyInsertStatementOptions, DataGridCopyUpdateStatementOptions, DataGridPrimaryKeyMode, DataGridTableMeta,
};
use crate::models::connection::DatabaseType;
use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime};
@@ -79,7 +79,7 @@ pub(super) fn write_sql_inserts(
column_types: Some(data.column_types),
source_columns: Some(data.source_columns),
rows: data.rows,
- exclude_primary_keys: context.request.options.sql.exclude_primary_keys_from_insert,
+ primary_key_mode: context.request.options.sql.primary_key_mode,
include_computed_columns: !context.request.options.sql.skip_computed_columns,
include_database_name: context.request.options.sql.include_database_name,
insert_mode: context.request.options.sql.insert_mode,
@@ -323,12 +323,22 @@ fn sql_selected_data(context: &ExtractContext<'_>, for_update: bool) -> Result<S
let mut included = Vec::new();
let mut omitted = Vec::new();
let mut included_indexes = Vec::new();
+ let known_columns: Vec<String> = context
+ .selected_columns
+ .iter()
+ .map(|column| column.source_name.as_deref().unwrap_or(&column.display_name).to_string())
+ .collect();
+ let table_meta = context.request.table_meta.as_ref();
+ let primary_keys = table_meta.map(|meta| meta.primary_keys.as_slice()).unwrap_or_default();
+ let column_info = table_meta.and_then(|meta| meta.columns.as_deref()).unwrap_or_default();
for (index, column) in context.selected_columns.iter().enumerate() {
let source_name = column.source_name.as_deref().unwrap_or(&column.display_name);
let info = context.selected_column_info[index];
- let is_primary_key = context.request.table_meta.as_ref().is_some_and(|meta| {
- meta.primary_keys.iter().any(|primary_key| normalized_name_eq(primary_key, source_name))
- });
+ let is_primary_key = if for_update {
+ primary_keys.iter().any(|primary_key| normalized_name_eq(primary_key, source_name))
+ } else {
+ is_primary_key_column(context.request.database_type, primary_keys, source_name, column_info, &known_columns)
+ };
let omit = (!for_update
&& is_grid_insert_omitted_column(
context.request.database_type,
@@ -343,13 +353,14 @@ fn sql_selected_data(context: &ExtractContext<'_>, for_update: bool) -> Result<S
&& info.is_some_and(is_auto_generated_column)
&& !is_primary_key)
|| (for_update && is_primary_key)
- // Exclude only auto-generated primary keys; manually-assigned key
- // columns must survive "without primary keys" INSERT copies
- // (composite keys would otherwise lose NOT NULL data).
|| (!for_update
- && context.request.options.sql.exclude_primary_keys_from_insert
- && is_primary_key
- && info.is_some_and(is_auto_generated_column));
+ && match context.request.options.sql.primary_key_mode {
+ DataGridPrimaryKeyMode::Include => false,
+ DataGridPrimaryKeyMode::ExcludeGenerated => {
+ is_primary_key && info.is_some_and(is_auto_generated_column)
+ }
+ DataGridPrimaryKeyMode::ExcludeAll => is_primary_key,
+ });
if omit {
omitted.push(source_name.to_string());
} else {
diff --git a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
index 7ac768ef51..86c069d3fc 100644
--- a/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
+++ b/crates/dbx-sql-data/src/data_grid_extractors/tests.rs
@@ -266,7 +266,7 @@ fn partially_deserialized_options_use_the_canonical_defaults() {
assert!(options.sql.skip_computed_columns);
assert!(!options.sql.skip_generated_columns);
assert_eq!(options.sql.insert_mode, crate::data_grid_sql::DataGridCopyInsertMode::Merged);
- assert!(!options.sql.exclude_primary_keys_from_insert);
+ assert_eq!(options.sql.primary_key_mode, crate::data_grid_sql::DataGridPrimaryKeyMode::Include);
assert!(options.sql.include_database_name);
assert!(options.sql.quote_identifiers);
assert_eq!(options.sql.temporal_format, DataGridTemporalFormat::Native);
@@ -742,6 +742,51 @@ fn builds_updates_with_hidden_primary_keys_and_selected_columns() {
);
}
+#[test]
+fn sql_updates_keep_legacy_case_insensitive_primary_key_resolution() {
+ let mut request = request(DataGridExtractorId::SqlUpdates);
+ request.columns = vec![column("ID", 0), column("id", 1), column("name", 2)];
+ request.selected_column_indexes = vec![1, 2];
+ request.rows = vec![vec![json!(1), json!(99), json!("Ada")]];
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "integer".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "integer".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+
+ let result = extract_data_grid_selection(request).expect("SQL UPDATE extraction");
+
+ assert_eq!(result.text, "UPDATE \"quoted_ids\" SET \"name\" = 'Ada' WHERE \"ID\" = 1;");
+}
+
#[test]
fn sql_copy_honors_kingbase_mysql_compat_connection_identifier_quote() {
let table_meta = DataGridTableMeta {
@@ -1413,7 +1458,7 @@ fn sql_insert_honors_primary_key_exclusion_and_row_by_row_mode() {
},
]),
});
- request.options.sql.exclude_primary_keys_from_insert = true;
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeGenerated;
request.options.sql.insert_mode = crate::data_grid_sql::DataGridCopyInsertMode::RowByRow;
let result = extract_data_grid_selection(request).expect("row-by-row SQL INSERT extraction");
@@ -1455,7 +1500,7 @@ fn sql_insert_primary_key_exclusion_omits_postgres_serial_key() {
]),
});
request.rows = vec![vec![json!(1), json!("Ada")]];
- request.options.sql.exclude_primary_keys_from_insert = true;
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeGenerated;
let result = extract_data_grid_selection(request).expect("PostgreSQL SQL INSERT extraction");
@@ -1464,7 +1509,7 @@ fn sql_insert_primary_key_exclusion_omits_postgres_serial_key() {
}
#[test]
-fn sql_insert_primary_key_exclusion_keeps_manual_composite_key_members() {
+fn sql_insert_generated_primary_key_exclusion_keeps_manual_composite_key_members() {
let mut request = request(DataGridExtractorId::SqlInserts);
request.table_meta = Some(DataGridTableMeta {
catalog: None,
@@ -1502,7 +1547,7 @@ fn sql_insert_primary_key_exclusion_keeps_manual_composite_key_members() {
request.columns = vec![column("id", 0), column("stat_date", 1), column("name", 2)];
request.selected_column_indexes = vec![0, 1, 2];
request.rows = vec![vec![json!(1), json!("2026-08-18"), json!("Ada")]];
- request.options.sql.exclude_primary_keys_from_insert = true;
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeGenerated;
let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
@@ -1510,6 +1555,236 @@ fn sql_insert_primary_key_exclusion_keeps_manual_composite_key_members() {
assert_eq!(result.omitted_columns, vec!["id"]);
}
+#[test]
+fn sql_insert_all_primary_key_mode_excludes_manual_composite_key_members() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "daily_stats".to_string(),
+ primary_keys: vec!["id".to_string(), "stat_date".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "bigint".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: Some("auto_increment".to_string()),
+ },
+ DataGridColumnInfo {
+ name: "stat_date".to_string(),
+ data_type: "date".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ request.columns = vec![column("id", 0), column("stat_date", 1), column("name", 2)];
+ request.selected_column_indexes = vec![0, 1, 2];
+ request.rows = vec![vec![json!(1), json!("2026-08-18"), json!("Ada")]];
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeAll;
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO \"daily_stats\" (\"name\") VALUES ('Ada');");
+ assert_eq!(result.omitted_columns, vec!["id", "stat_date"]);
+}
+
+#[test]
+fn sql_insert_primary_key_exclusion_matches_unique_case_insensitive_mysql_primary_key_names() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.database_type = Some(DatabaseType::Mysql);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ request.columns = vec![column("id", 0), column("name", 1)];
+ request.selected_column_indexes = vec![0, 1];
+ request.rows = vec![vec![json!(1), json!("Ada")]];
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeAll;
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO `users` (`name`) VALUES ('Ada');");
+ assert_eq!(result.omitted_columns, vec!["id"]);
+}
+
+#[test]
+fn sql_insert_preserves_case_insensitive_mysql_identity_primary_key_columns() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.database_type = Some(DatabaseType::Mysql);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: Some("auto_increment".to_string()),
+ }]),
+ });
+ request.columns = vec![column("id", 0)];
+ request.selected_column_indexes = vec![0];
+ request.rows = vec![vec![json!(1)]];
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO `users` (`id`) VALUES (1);");
+ assert!(result.omitted_columns.is_empty());
+}
+
+#[test]
+fn sql_insert_primary_key_exclusion_preserves_case_distinct_postgres_columns() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: Some("public".to_string()),
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ });
+ request.columns = vec![column("ID", 0), column("id", 1), column("name", 2)];
+ request.selected_column_indexes = vec![0, 1, 2];
+ request.rows = vec![vec![json!("key"), json!("lowercase"), json!("Ada")]];
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeAll;
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO \"public\".\"quoted_ids\" (\"id\", \"name\") VALUES ('lowercase', 'Ada');");
+ assert_eq!(result.omitted_columns, vec!["ID"]);
+}
+
+#[test]
+fn sql_insert_primary_key_exclusion_uses_exact_postgres_names_with_incomplete_metadata() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "integer".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: Some("identity".to_string()),
+ }]),
+ });
+ request.columns = vec![column("id", 0), column("name", 1)];
+ request.selected_column_indexes = vec![0, 1];
+ request.rows = vec![vec![json!("lowercase"), json!("Ada")]];
+ request.options.sql.primary_key_mode = crate::data_grid_sql::DataGridPrimaryKeyMode::ExcludeGenerated;
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO \"quoted_ids\" (\"id\", \"name\") VALUES ('lowercase', 'Ada');");
+ assert!(result.omitted_columns.is_empty());
+}
+
+#[test]
+fn sql_insert_uses_exact_column_metadata_for_case_distinct_identity_columns() {
+ let mut request = request(DataGridExtractorId::SqlInserts);
+ request.table_meta = Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "integer".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: Some("identity".to_string()),
+ },
+ ]),
+ });
+ request.columns = vec![column("id", 0)];
+ request.selected_column_indexes = vec![0];
+ request.rows = vec![vec![json!("lowercase")]];
+
+ let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
+
+ assert_eq!(result.text, "INSERT INTO \"quoted_ids\" (\"id\") VALUES ('lowercase');");
+ assert!(result.omitted_columns.is_empty());
+}
+
#[test]
fn rejects_invalid_dsv_configuration() {
let mut request = request(DataGridExtractorId::Dsv);
diff --git a/crates/dbx-sql-data/src/data_grid_sql.rs b/crates/dbx-sql-data/src/data_grid_sql.rs
index d7fcb7a473..0f13637fcc 100644
--- a/crates/dbx-sql-data/src/data_grid_sql.rs
+++ b/crates/dbx-sql-data/src/data_grid_sql.rs
@@ -159,7 +159,7 @@ pub struct DataGridCopyInsertStatementOptions {
#[serde(default)]
pub rows: Vec<Vec<Value>>,
#[serde(default)]
- pub exclude_primary_keys: bool,
+ pub primary_key_mode: DataGridPrimaryKeyMode,
#[serde(default)]
pub include_computed_columns: bool,
#[serde(default = "default_include_database_name")]
@@ -181,6 +181,16 @@ pub enum DataGridCopyInsertMode {
RowByRow,
}
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "openapi", derive(utoipa::ToSchema))]
+#[serde(rename_all = "kebab-case")]
+pub enum DataGridPrimaryKeyMode {
+ #[default]
+ Include,
+ ExcludeGenerated,
+ ExcludeAll,
+}
+
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum DataGridContextFilterMode {
@@ -550,11 +560,8 @@ pub(crate) fn build_data_grid_copy_insert_statement_with_formatters(
) -> Option<String> {
let save_columns = effective_copy_columns(options.source_columns.as_deref(), &options.columns);
let column_info = options.table_meta.as_ref().and_then(|meta| meta.columns.as_deref()).unwrap_or(&[]);
- let primary_key_set: Vec<String> = options
- .table_meta
- .as_ref()
- .map(|meta| meta.primary_keys.iter().map(|primary_key| normalize_column_name(primary_key)).collect())
- .unwrap_or_default();
+ let primary_keys = options.table_meta.as_ref().map(|meta| meta.primary_keys.as_slice()).unwrap_or_default();
+ let known_columns: Vec<String> = save_columns.iter().flatten().cloned().collect();
let insertable_columns: Vec<(&str, usize, Option<DataGridColumnInfo>)> = save_columns
.iter()
.enumerate()
@@ -562,7 +569,7 @@ pub(crate) fn build_data_grid_copy_insert_statement_with_formatters(
.map(|(column, index)| {
let fallback_type =
options.column_types.as_deref().and_then(|types| types.get(index)).and_then(|value| value.as_deref());
- (column, index, copy_column_info(column_info, column, fallback_type))
+ (column, index, copy_column_info(options.database_type, column_info, column, fallback_type))
})
.filter(|(column, _, info)| {
!is_grid_insert_omitted_column(
@@ -573,16 +580,18 @@ pub(crate) fn build_data_grid_copy_insert_statement_with_formatters(
)
})
.collect();
- // "Exclude primary keys" keeps manually-assigned key columns: dropping a
- // non-auto-generated PK member loses data and yields an INSERT that cannot
- // satisfy NOT NULL. Only auto-generated (auto_increment/identity) keys are
- // excluded, matching DBeaver's SQLGeneratorInsert excludeAutoGeneratedColumn.
let insert_columns: Vec<(&str, usize, Option<DataGridColumnInfo>)> = insertable_columns
.iter()
.filter(|(column, _, info)| {
- !options.exclude_primary_keys
- || !primary_key_set.contains(&normalize_column_name(column))
- || !info.as_ref().is_some_and(is_auto_generated_column)
+ let is_primary_key =
+ is_primary_key_column(options.database_type, primary_keys, column, column_info, &known_columns);
+ match options.primary_key_mode {
+ DataGridPrimaryKeyMode::Include => true,
+ DataGridPrimaryKeyMode::ExcludeGenerated => {
+ !is_primary_key || !info.as_ref().is_some_and(is_auto_generated_column)
+ }
+ DataGridPrimaryKeyMode::ExcludeAll => !is_primary_key,
+ }
})
.cloned()
.collect();
@@ -2239,7 +2248,7 @@ fn resolve_hive_target_column(table_meta: &DataGridTableMeta, result_column: &st
let Some(columns) = table_meta.columns.as_deref() else {
return result_column.to_string();
};
- if let Some(column) = unique_column_info_match(columns, result_column) {
+ if let Some(column) = unique_column_info_match(Some(DatabaseType::Hive), columns, result_column) {
return column.name.clone();
}
let Some(unqualified) = last_qualified_identifier_component(result_column) else {
@@ -2247,14 +2256,21 @@ fn resolve_hive_target_column(table_meta: &DataGridTableMeta, result_column: &st
};
// Hive JDBC may expose SELECT * labels as `table.column`. Resolve them through
// target metadata, while exact matching above preserves real dotted column names.
- unique_column_info_match(columns, &unqualified)
+ unique_column_info_match(Some(DatabaseType::Hive), columns, &unqualified)
.map_or_else(|| result_column.to_string(), |column| column.name.clone())
}
-fn unique_column_info_match<'a>(columns: &'a [DataGridColumnInfo], name: &str) -> Option<&'a DataGridColumnInfo> {
+pub(crate) fn unique_column_info_match<'a>(
+ database_type: Option<DatabaseType>,
+ columns: &'a [DataGridColumnInfo],
+ name: &str,
+) -> Option<&'a DataGridColumnInfo> {
if let Some(column) = columns.iter().find(|column| column.name == name) {
return Some(column);
}
+ if matches!(database_type, Some(DatabaseType::Postgres | DatabaseType::Redshift)) {
+ return None;
+ }
let normalized = normalize_column_name(name);
let mut matches = columns.iter().filter(|column| normalize_column_name(&column.name) == normalized);
let first = matches.next()?;
@@ -2371,11 +2387,12 @@ fn effective_copy_columns(source_columns: Option<&[Option<String>]>, columns: &[
}
fn copy_column_info(
+ database_type: Option<DatabaseType>,
column_info: &[DataGridColumnInfo],
column: &str,
fallback_type: Option<&str>,
) -> Option<DataGridColumnInfo> {
- if let Some(info) = column_info_for(column_info, column) {
+ if let Some(info) = unique_column_info_match(database_type, column_info, column) {
return Some(info.clone());
}
fallback_type.map(|data_type| DataGridColumnInfo {
@@ -3772,6 +3789,44 @@ fn normalize_column_name(name: &str) -> String {
name.to_ascii_uppercase()
}
+pub(crate) fn is_primary_key_column(
+ database_type: Option<DatabaseType>,
+ primary_keys: &[String],
+ column_name: &str,
+ column_info: &[DataGridColumnInfo],
+ known_columns: &[String],
+) -> bool {
+ if primary_keys.iter().any(|primary_key| primary_key == column_name) {
+ return true;
+ }
+
+ let normalized = normalize_column_name(column_name);
+ let matching_metadata: Vec<&DataGridColumnInfo> =
+ column_info.iter().filter(|column| normalize_column_name(&column.name) == normalized).collect();
+ let exact_metadata = matching_metadata.iter().find(|column| column.name == column_name);
+ if exact_metadata.is_some_and(|metadata| metadata.is_primary_key) {
+ return true;
+ }
+ if matches!(database_type, Some(DatabaseType::Postgres | DatabaseType::Redshift)) {
+ return false;
+ }
+ if matching_metadata.len() == 1 {
+ let metadata = matching_metadata[0];
+ return metadata.is_primary_key
+ || primary_keys.iter().filter(|primary_key| normalize_column_name(primary_key) == normalized).count() == 1;
+ }
+ if matching_metadata.len() > 1 {
+ return false;
+ }
+
+ let visible_spellings: std::collections::HashSet<&str> =
+ known_columns.iter().filter(|column| normalize_column_name(column) == normalized).map(String::as_str).collect();
+ if visible_spellings.len() > 1 {
+ return false;
+ }
+ primary_keys.iter().filter(|primary_key| normalize_column_name(primary_key) == normalized).count() == 1
+}
+
fn null_write_error(column: &str) -> String {
format!("Column \"{column}\" does not allow NULL.")
}
@@ -4898,7 +4953,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("ada"), json!("Ada")], vec![json!(2), json!("linus"), json!("Linus")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -4950,7 +5005,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("Ada")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -4997,7 +5052,7 @@ mod tests {
Some("NAME".to_string()),
]),
rows: vec![vec![json!("A-1"), json!("A-1"), json!("Ada")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5054,7 +5109,7 @@ mod tests {
Some("display_name_upper".to_string()),
]),
rows: vec![vec![json!(1), json!("Ada"), json!("ADA")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5084,7 +5139,7 @@ mod tests {
}
#[test]
- fn copy_insert_primary_key_exclusion_keeps_manual_composite_key_members() {
+ fn copy_insert_generated_primary_key_exclusion_keeps_manual_composite_key_members() {
let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
database_type: Some(DatabaseType::Mysql),
identifier_quote: None,
@@ -5125,7 +5180,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("2026-08-18"), json!("sweater")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5137,7 +5192,7 @@ mod tests {
}
#[test]
- fn copy_insert_primary_key_exclusion_keeps_manual_primary_keys() {
+ fn copy_insert_primary_key_exclusion_removes_manual_primary_keys() {
let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
database_type: Some(DatabaseType::Postgres),
identifier_quote: None,
@@ -5170,21 +5225,165 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!("AD"), json!("Andorra")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
+ include_computed_columns: false,
+ include_database_name: true,
+ insert_mode: DataGridCopyInsertMode::Merged,
+ });
+ assert_eq!(statement.as_deref(), Some("INSERT INTO \"public\".\"countries\" (\"label\") VALUES ('Andorra');"));
+ }
+
+ #[test]
+ fn copy_insert_primary_key_exclusion_matches_unique_case_insensitive_mysql_primary_key_names() {
+ let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
+ database_type: Some(DatabaseType::Mysql),
+ identifier_quote: None,
+ table_meta: Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "users".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "int".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ }]),
+ }),
+ columns: vec!["id".to_string()],
+ column_types: None,
+ source_columns: None,
+ rows: vec![vec![json!(1)]],
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
+ include_computed_columns: false,
+ include_database_name: true,
+ insert_mode: DataGridCopyInsertMode::Merged,
+ });
+
+ assert!(statement.is_none());
+ }
+
+ #[test]
+ fn copy_insert_primary_key_exclusion_preserves_case_distinct_postgres_columns() {
+ let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
+ database_type: Some(DatabaseType::Postgres),
+ identifier_quote: None,
+ table_meta: Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: Some("public".to_string()),
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![
+ DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "id".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ DataGridColumnInfo {
+ name: "name".to_string(),
+ data_type: "text".to_string(),
+ is_nullable: false,
+ is_primary_key: false,
+ column_default: None,
+ extra: None,
+ },
+ ]),
+ }),
+ columns: vec!["ID".to_string(), "id".to_string(), "name".to_string()],
+ column_types: None,
+ source_columns: None,
+ rows: vec![vec![json!("key"), json!("lowercase"), json!("Ada")]],
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
});
+
+ assert_eq!(
+ statement.as_deref(),
+ Some("INSERT INTO \"public\".\"quoted_ids\" (\"id\", \"name\") VALUES ('lowercase', 'Ada');")
+ );
+ }
+
+ #[test]
+ fn copy_insert_primary_key_exclusion_uses_exact_postgres_names_without_column_metadata() {
+ let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
+ database_type: Some(DatabaseType::Postgres),
+ identifier_quote: None,
+ table_meta: Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: None,
+ }),
+ columns: vec!["id".to_string()],
+ column_types: None,
+ source_columns: None,
+ rows: vec![vec![json!("lowercase")]],
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
+ include_computed_columns: false,
+ include_database_name: true,
+ insert_mode: DataGridCopyInsertMode::Merged,
+ });
+
+ assert_eq!(statement.as_deref(), Some("INSERT INTO \"quoted_ids\" (\"id\") VALUES ('lowercase');"));
+ }
+
+ #[test]
+ fn copy_insert_uses_exact_postgres_column_metadata_for_case_distinct_columns() {
+ let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
+ database_type: Some(DatabaseType::Postgres),
+ identifier_quote: None,
+ table_meta: Some(DataGridTableMeta {
+ catalog: None,
+ database: None,
+ schema: None,
+ table_name: "quoted_ids".to_string(),
+ primary_keys: vec!["ID".to_string()],
+ columns: Some(vec![DataGridColumnInfo {
+ name: "ID".to_string(),
+ data_type: "jsonb".to_string(),
+ is_nullable: false,
+ is_primary_key: true,
+ column_default: None,
+ extra: Some("identity".to_string()),
+ }]),
+ }),
+ columns: vec!["id".to_string()],
+ column_types: Some(vec![Some("text".to_string())]),
+ source_columns: None,
+ rows: vec![vec![json!({"value": "lowercase"})]],
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
+ include_computed_columns: false,
+ include_database_name: true,
+ insert_mode: DataGridCopyInsertMode::Merged,
+ });
+
assert_eq!(
statement.as_deref(),
- Some("INSERT INTO \"public\".\"countries\" (\"code\", \"label\") VALUES ('AD', 'Andorra');")
+ Some("INSERT INTO \"quoted_ids\" (\"id\") VALUES ('{\"value\":\"lowercase\"}');")
);
}
#[test]
- fn copy_insert_primary_key_exclusion_keeps_unknown_metadata_primary_keys() {
- // Without column metadata we cannot prove the key is auto-generated;
- // keep it rather than silently dropping NOT NULL data.
+ fn copy_insert_primary_key_exclusion_removes_keys_without_column_metadata() {
let statement = build_data_grid_copy_insert_statement(DataGridCopyInsertStatementOptions {
database_type: Some(DatabaseType::Mysql),
identifier_quote: None,
@@ -5200,12 +5399,12 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("ada")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeAll,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
});
- assert_eq!(statement.as_deref(), Some("INSERT INTO `users` (`id`, `login_name`) VALUES (1, 'ada');"));
+ assert_eq!(statement.as_deref(), Some("INSERT INTO `users` (`login_name`) VALUES ('ada');"));
}
#[test]
@@ -5218,7 +5417,7 @@ mod tests {
column_types: Some(vec![Some("number".to_string()), Some("boolean".to_string()), Some("json".to_string())]),
source_columns: None,
rows: vec![vec![json!(7), json!(true), json!(r#"{"name":"Ada","roles":["admin"]}"#)]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5240,7 +5439,7 @@ mod tests {
column_types: Some(vec![Some("json".to_string())]),
source_columns: None,
rows: vec![vec![json!([1, 2, 3])]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5259,7 +5458,7 @@ mod tests {
column_types: Some(vec![Some("json".to_string())]),
source_columns: None,
rows: vec![vec![json!([])]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5278,7 +5477,7 @@ mod tests {
column_types: Some(vec![Some("json".to_string())]),
source_columns: None,
rows: vec![vec![json!({"a": 1})]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5395,7 +5594,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!("ada"), json!("Ada")]],
- exclude_primary_keys: true,
+ primary_key_mode: DataGridPrimaryKeyMode::ExcludeGenerated,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5424,7 +5623,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("ada"), json!("Ada")], vec![json!(2), json!("linus"), json!("Linus")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::RowByRow,
@@ -5454,7 +5653,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("Ada")], vec![json!(2), json!("Linus")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5488,7 +5687,7 @@ mod tests {
column_types: None,
source_columns: None,
rows,
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode,
@@ -5575,7 +5774,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: rows.clone(),
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5644,7 +5843,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("Hello"), json!("'hello':1A")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5682,7 +5881,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(7), json!("ok"), json!("0x00000000000007D1"), json!(42)]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -5748,7 +5947,7 @@ mod tests {
]),
source_columns: None,
rows: vec![vec![json!(1), json!("2022-08-25T09:58:43Z"), json!("2022-08-25T09:58:43Z")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -7969,7 +8168,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(1), json!("login")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -10188,7 +10387,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!(2), json!("new")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
@@ -10907,7 +11106,7 @@ mod tests {
column_types: None,
source_columns: None,
rows: vec![vec![json!("before"), json!("0x00ff")]],
- exclude_primary_keys: false,
+ primary_key_mode: DataGridPrimaryKeyMode::Include,
include_computed_columns: false,
include_database_name: true,
insert_mode: DataGridCopyInsertMode::Merged,
diff --git a/packages/app-tests/useDataGridExport.test.ts b/packages/app-tests/useDataGridExport.test.ts
index f696e022c8..ee5da99ac7 100644
--- a/packages/app-tests/useDataGridExport.test.ts
+++ b/packages/app-tests/useDataGridExport.test.ts
@@ -641,10 +641,10 @@ test("table data SQL export keeps source column names", async () => {
}
});
-function sqlExclusionOptions(): DataGridExtractorOptions {
+function sqlExclusionOptions(primaryKeyMode: DataGridExtractorOptions["sql"]["primaryKeyMode"] = "exclude-generated"): DataGridExtractorOptions {
return {
...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS,
- sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, excludePrimaryKeysFromInsert: true },
+ sql: { ...DEFAULT_DATA_GRID_EXTRACTOR_OPTIONS.sql, primaryKeyMode },
};
}
@@ -666,7 +666,8 @@ test("table data SQL export passes primary key exclusion to the backend", async
await composable.exportSql();
- assert.equal(apiMock.startTableExport.mock.calls[0][0].excludePrimaryKeys, true);
+ assert.equal(apiMock.startTableExport.mock.calls[0][0].primaryKeyMode, "exclude-generated");
+ assert.deepEqual(apiMock.startTableExport.mock.calls[0][0].primaryKeys, ["id"]);
});
test("query result SQL export passes primary key exclusion and keys to the backend", async () => {
@@ -687,7 +688,7 @@ test("query result SQL export passes primary key exclusion and keys to the backe
await composable.exportSql();
- assert.equal(apiMock.startQueryResultExport.mock.calls[0][0].excludePrimaryKeys, true);
+ assert.equal(apiMock.startQueryResultExport.mock.calls[0][0].primaryKeyMode, "exclude-generated");
assert.deepEqual(apiMock.startQueryResultExport.mock.calls[0][0].primaryKeys, ["id"]);
});
@@ -706,15 +707,35 @@ test("table data SQL export keeps manually-assigned primary keys", async () => {
await composable.exportSql();
- assert.equal(apiMock.startTableExport.mock.calls[0][0].excludePrimaryKeys, undefined);
+ assert.equal(apiMock.startTableExport.mock.calls[0][0].primaryKeyMode, "exclude-generated");
+ assert.deepEqual(apiMock.startTableExport.mock.calls[0][0].primaryKeys, ["user_code"]);
+});
+
+test("table data SQL export passes all-primary-key mode including manual keys", async () => {
+ runtimeMock.isTauri = true;
+ dialogMock.save.mockResolvedValue("/tmp/users-all-keys.sql");
+ const { composable } = buildExportHarness({
+ context: "table-data",
+ tableMeta: {
+ tableName: "users",
+ primaryKeys: ["user_code"],
+ columns: [{ name: "user_code", data_type: "varchar", is_nullable: false, is_primary_key: true }],
+ },
+ extractorOptions: sqlExclusionOptions("exclude-all"),
+ });
+
+ await composable.exportSql();
+
+ assert.equal(apiMock.startTableExport.mock.calls[0][0].primaryKeyMode, "exclude-all");
+ assert.deepEqual(apiMock.startTableExport.mock.calls[0][0].primaryKeys, ["user_code"]);
});
test("local SQL export asks the backend to drop primary key columns", async () => {
const download = installTextDownloadCapture();
const completeLocalResult: QueryResult = {
- columns: ["id", "name"],
- column_types: ["int4", "text"],
- rows: [[1, "Ada"]],
+ columns: ["user_code", "name"],
+ column_types: ["varchar", "text"],
+ rows: [["A-1", "Ada"]],
affected_rows: 0,
execution_time_ms: 1,
truncated: false,
@@ -729,19 +750,19 @@ test("local SQL export asks the backend to drop primary key columns", async () =
completeLocalResult,
tableMeta: {
tableName: "users",
- primaryKeys: ["id"],
+ primaryKeys: ["user_code"],
columns: [
- { name: "id", data_type: "int4", is_nullable: false, is_primary_key: true, extra: "auto_increment" },
+ { name: "user_code", data_type: "varchar", is_nullable: false, is_primary_key: true },
{ name: "name", data_type: "text", is_nullable: true },
],
},
- extractorOptions: sqlExclusionOptions(),
+ extractorOptions: sqlExclusionOptions("exclude-all"),
});
await composable.exportSql();
- assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].excludeColumns, ["id"]);
- assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].columns, ["id", "name"]);
+ assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].excludeColumns, ["user_code"]);
+ assert.deepEqual(apiMock.buildExportSqlInsert.mock.calls[0][0].columns, ["user_code", "name"]);
} finally {
download.restore();
}