Merge remote-tracking branch 'origin/main' into slog

makasim · Nov 10, 2024 · 1bb0532 · 1bb0532
2 parents e7681bd + 2abddbf
commit 1bb0532
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/data.go b/data.go
@@ -15,6 +15,7 @@ type Data struct {
 func (d *Data) CopyTo(to *Data) *Data {
 	to.ID = d.ID
 	to.Rev = d.Rev
+	to.Binary = d.Binary
 	to.B = append(to.B[:0], d.B...)
 
 	return to

diff --git a/pgdriver/commiter.go b/pgdriver/commiter.go
@@ -97,14 +97,14 @@ func (cmtr *Commiter) Do(cmd0 flowstate.Command) error {
 		if committableStateCtx.Committed.Rev > 0 {
 			if err := cmtr.q.UpdateState(context.Background(), tx, &nextState); isConflict(err) {
 				conflictErr.Add(fmt.Sprintf("%T", cmd), committableStateCtx.Current.ID, err)
-				continue
+				return conflictErr
 			} else if err != nil {
 				return fmt.Errorf("update state: %w", err)
 			}
 		} else {
 			if err := cmtr.q.InsertState(context.Background(), tx, &nextState); isConflict(err) {
 				conflictErr.Add(fmt.Sprintf("%T", cmd), committableStateCtx.Current.ID, err)
-				continue
+				return conflictErr
 			} else if err != nil {
 				return fmt.Errorf("insert state: %w", err)
 			}