From 58f58a629b86d5659bdf5ce6dc1b96c08104b6d6 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 6 Sep 2023 14:58:25 -0700
Subject: [PATCH] Tolerate channel buffer operations being re-sent

---
 crates/collab/src/db/queries/buffers.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/collab/src/db/queries/buffers.rs b/crates/collab/src/db/queries/buffers.rs
index 8236eb9c3b072a3b082daa1089ea2e00247198b1..00de20140320640d98517556a5321433ad891f86 100644
--- 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?;
             }