From 31902363968c95ebb364d42ebac2871a3761bbc7 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 16 Nov 2022 08:57:19 +0100 Subject: [PATCH] Update worktree entry instead of erroring when it already exists --- crates/collab/src/db.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index e503188e1dc4621329119368ac5e6dd376d0a72d..44cc382ee0027ab22491debf8923a05cf79075f7 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -1620,6 +1620,14 @@ where is_ignored ) VALUES {params} + ON CONFLICT (project_id, worktree_id, id) DO UPDATE SET + is_dir = excluded.is_dir, + path = excluded.path, + inode = excluded.inode, + mtime_seconds = excluded.mtime_seconds, + mtime_nanos = excluded.mtime_nanos, + is_symlink = excluded.is_symlink, + is_ignored = excluded.is_ignored " ); let mut query = sqlx::query(&query);