fix(core): include auto-increment primary keys in copied INSERTs

This commit is contained in:
dienaso authored and GitHub committed 2026-07-30 21:10:19 +08:00
1 parent a7a0b69605
commit 31ad4cfaca
4 files changed
+60 -5

No files matched your search

@@ -417,6 +417,22 @@ describe("useDataGridExport prepared row statements", () => {
expect(state.canCopyWithExtractor("sql-inserts")).toBe(false); 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 () => { 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"]] }; const matrix: CellSelectionMatrix = { rowIndexes: [0], columnIndexes: [1], columns: ["name"], rows: [["Ada"]] };
vi.mocked(extractDataGridSelection).mockResolvedValueOnce({ vi.mocked(extractDataGridSelection).mockResolvedValueOnce({
@@ -1386,7 +1386,8 @@ function isCopyInsertOmittedColumn(databaseType: DatabaseType | undefined, colum
const extra = columnInfo?.extra?.toLowerCase() ?? ""; const extra = columnInfo?.extra?.toLowerCase() ?? "";
const isAutoGenerated = /\b(auto_increment|autoincrement|identity)\b/.test(extra); const isAutoGenerated = /\b(auto_increment|autoincrement|identity)\b/.test(extra);
const isComputed = extra.includes("generated always as") && !extra.includes("identity"); 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 { function normalizeColumnName(name: string): string {
@@ -229,7 +229,9 @@ fn sql_selected_data(context: &ExtractContext<'_>, for_update: bool) -> Result<S
|| (for_update || (for_update
&& context.request.options.sql.skip_computed_columns && context.request.options.sql.skip_computed_columns
&& info.is_some_and(|column| is_non_identity_generated_column(Some(column)))) && info.is_some_and(|column| is_non_identity_generated_column(Some(column))))
|| (context.request.options.sql.skip_generated_columns && info.is_some_and(is_auto_generated_column)) || (context.request.options.sql.skip_generated_columns
&& info.is_some_and(is_auto_generated_column)
&& !is_primary_key)
|| (for_update && is_primary_key) || (for_update && is_primary_key)
|| (!for_update && context.request.options.sql.exclude_primary_keys_from_insert && is_primary_key); || (!for_update && context.request.options.sql.exclude_primary_keys_from_insert && is_primary_key);
if omit { if omit {
@@ -486,13 +486,13 @@ fn sql_insert_skips_generated_and_computed_columns() {
let result = extract_data_grid_selection(request).expect("SQL INSERT extraction"); let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
assert!(result.text.contains("name")); assert!(result.text.contains("name"));
assert!(!result.text.contains("search_text")); assert!(!result.text.contains("search_text"));
assert!(!result.text.contains("(id,")); assert!(result.text.contains("(\"id\", \"name\")"));
assert_eq!(result.omitted_columns, vec!["id", "search_text"]); assert_eq!(result.omitted_columns, vec!["search_text"]);
let included = let included =
extract_data_grid_selection(include_computed_request).expect("SQL INSERT extraction with computed columns"); extract_data_grid_selection(include_computed_request).expect("SQL INSERT extraction with computed columns");
assert!(included.text.contains("search_text")); assert!(included.text.contains("search_text"));
assert_eq!(included.omitted_columns, vec!["id"]); assert!(included.omitted_columns.is_empty());
let included = let included =
extract_data_grid_selection(include_generated_request).expect("SQL INSERT extraction with generated columns"); extract_data_grid_selection(include_generated_request).expect("SQL INSERT extraction with generated columns");
@@ -500,6 +500,42 @@ fn sql_insert_skips_generated_and_computed_columns() {
assert_eq!(included.omitted_columns, vec!["search_text"]); assert_eq!(included.omitted_columns, vec!["search_text"]);
} }
#[test]
fn sql_insert_keeps_autoincrement_primary_key_by_default() {
let mut request = request(DataGridExtractorId::SqlInserts);
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: true,
column_default: None,
extra: Some("auto_increment".to_string()),
},
DataGridColumnInfo {
name: "name".to_string(),
data_type: "varchar".to_string(),
is_nullable: false,
is_primary_key: false,
column_default: None,
extra: None,
},
]),
});
let result = extract_data_grid_selection(request).expect("SQL INSERT extraction");
assert!(result.text.contains("INSERT INTO \"users\" (\"id\", \"name\")"));
assert!(result.text.contains("(1, 'Ada')"));
assert!(result.omitted_columns.is_empty());
}
#[test] #[test]
fn sql_insert_honors_primary_key_exclusion_and_row_by_row_mode() { fn sql_insert_honors_primary_key_exclusion_and_row_by_row_mode() {
let mut request = request(DataGridExtractorId::SqlInserts); let mut request = request(DataGridExtractorId::SqlInserts);