diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts index c52a81daa5..8139866673 100644 --- a/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts +++ b/apps/desktop/src/composables/__tests__/useDataGridExport.spec.ts @@ -417,6 +417,22 @@ describe("useDataGridExport prepared row statements", () => { expect(state.canCopyWithExtractor("sql-inserts")).toBe(false); }); + it("keeps an auto-increment primary key when copying only the primary key column as INSERT", () => { + const autoIncrementTable: DataGridTableMeta = { + tableName: "users", + primaryKeys: ["id"], + columns: [ + { name: "id", data_type: "int", is_nullable: false, is_primary_key: true, extra: "auto_increment" }, + { name: "name", data_type: "varchar", is_nullable: false }, + ], + }; + const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [0], columns: ["id"], rows: [[1]] }; + + const state = createExportState(autoIncrementTable, ["id", "name"], matrix); + + expect(state.canCopyWithExtractor("sql-inserts")).toBe(true); + }); + it("sends only selected values for non-SQL extraction and marks column selections", async () => { const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [1], columns: ["name"], rows: [["Ada"]] }; vi.mocked(extractDataGridSelection).mockResolvedValueOnce({ diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts index fec4b0d17c..3b518b96c4 100644 --- a/apps/desktop/src/composables/useDataGridExport.ts +++ b/apps/desktop/src/composables/useDataGridExport.ts @@ -1386,7 +1386,8 @@ function isCopyInsertOmittedColumn(databaseType: DatabaseType | undefined, colum const extra = columnInfo?.extra?.toLowerCase() ?? ""; const isAutoGenerated = /\b(auto_increment|autoincrement|identity)\b/.test(extra); const isComputed = extra.includes("generated always as") && !extra.includes("identity"); - return ((extractorOptions?.sql.skipGeneratedColumns ?? true) && isAutoGenerated) || ((extractorOptions?.sql.skipComputedColumns ?? true) && isComputed); + const isPrimaryKey = (tableMeta?.primaryKeys ?? []).some((key) => normalizeColumnName(key) === normalizeColumnName(column)); + return ((extractorOptions?.sql.skipGeneratedColumns ?? true) && isAutoGenerated && !isPrimaryKey) || ((extractorOptions?.sql.skipComputedColumns ?? true) && isComputed); } function normalizeColumnName(name: string): string { diff --git a/crates/dbx-core/src/data_grid_extractors/sql.rs b/crates/dbx-core/src/data_grid_extractors/sql.rs index ae66bf0a14..f3eb4df492 100644 --- a/crates/dbx-core/src/data_grid_extractors/sql.rs +++ b/crates/dbx-core/src/data_grid_extractors/sql.rs @@ -229,7 +229,9 @@ fn sql_selected_data(context: &ExtractContext<'_>, for_update: bool) -> Result