Tolerate channel buffer operations being re-sent

2023-09-06 14:58:25 -07:00 · 2023-09-06 14:58:25 -07:00 · 58f58a629b
commit 58f58a629b
parent ed2aed4f93
1 changed files with 10 additions and 0 deletions
--- a/crates/collab/src/db/queries/buffers.rs
+++ b/crates/collab/src/db/queries/buffers.rs
@ -380,6 +380,16 @@ impl Database {
                .collect::<Vec<_>>();
            if !operations.is_empty() {
                buffer_operation::Entity::insert_many(operations)
+                    .on_conflict(
+                        OnConflict::columns([
+                            buffer_operation::Column::BufferId,
+                            buffer_operation::Column::Epoch,
+                            buffer_operation::Column::LamportTimestamp,
+                            buffer_operation::Column::ReplicaId,
+                        ])
+                        .do_nothing()
+                        .to_owned(),
+                    )
                    .exec(&*tx)
                    .await?;
            }