Merge pull request #2892 from dolthub/fulghum/on_duplicate

fulghum · web-flow · commit f61a772a7e35 · 2025-03-14T19:16:59.000-07:00
Bug fix: Call `StatementBegin` for all TableEditors used in `insertIter`
diff --git a/sql/rowexec/dml.go b/sql/rowexec/dml.go
@@ -101,9 +101,15 @@ func (b *BaseBuilder) buildInsertInto(ctx *sql.Context, ii *plan.InsertInto, row
 	}
 
 	if ii.Ignore {
+		// If ignore is set, then we are either replacing or inserting, but not updating on conflicts
 		return plan.NewCheckpointingTableEditorIter(insertIter, ed), nil
 	} else {
-		return plan.NewTableEditorIter(insertIter, ed), nil
+		// Otherwise, we are potentially inserting AND updating if there are conflicts
+		eds := []sql.EditOpenerCloser{ed}
+		if updater != nil {
+			eds = append(eds, updater)
+		}
+		return plan.NewTableEditorIter(insertIter, eds...), nil
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,15 @@ func (b BaseBuilder) buildInsertInto(ctx sql.Context, ii *plan.InsertInto, row`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if ii.Ignore {`
	`104`	`+ // If ignore is set, then we are either replacing or inserting, but not updating on conflicts`
`104`	`105`	`return plan.NewCheckpointingTableEditorIter(insertIter, ed), nil`
`105`	`106`	`} else {`
`106`		`- return plan.NewTableEditorIter(insertIter, ed), nil`
	`107`	`+ // Otherwise, we are potentially inserting AND updating if there are conflicts`
	`108`	`+ eds := []sql.EditOpenerCloser{ed}`
	`109`	`+ if updater != nil {`
	`110`	`+ eds = append(eds, updater)`
	`111`	`+ }`
	`112`	`+ return plan.NewTableEditorIter(insertIter, eds...), nil`
`107`	`113`	`}`
`108`	`114`	`}`
`109`	`115`