mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 19:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Improve channel deletion to be DAG aware

Browse source
This commit is contained in:
Mikayla 2023-09-07 15:23:37 -07:00
parent 273fa9dd22
commit 441848d195
No known key found for this signature in database
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
crates/collab/src/db/queries/channels.rs
View file

@ -150,6 +150,21 @@ impl Database {
.exec(&*tx) .exec(&*tx)
.await?; .await?;
// Delete any other paths that incldue this channel
let sql = r#"
DELETE FROM channel_paths
WHERE
id_path LIKE '%' || $1 || '%'
"#;
let channel_paths_stmt = Statement::from_sql_and_values(
self.pool.get_database_backend(),
sql,
[
channel_id.to_proto().into(),
],
);
tx.execute(channel_paths_stmt).await?;
Ok((channels_to_remove.into_keys().collect(), members_to_notify)) Ok((channels_to_remove.into_keys().collect(), members_to_notify))
}) })
.await .await
@ -844,13 +859,6 @@ impl Database {
// channel if they've linked the channel to one where they're an admin. // channel if they've linked the channel to one where they're an admin.
self.check_user_is_channel_admin(from, user, &*tx).await?; self.check_user_is_channel_admin(from, user, &*tx).await?;
if let Some(to) = to {
self.check_user_is_channel_admin(to, user, &*tx).await?;
self.link_channel(from, to, &*tx).await?;
}
// The removal must come after the linking so that we don't leave
// sub channels stranded
if let Some(from_parent) = from_parent { if let Some(from_parent) = from_parent {
self.check_user_is_channel_admin(from_parent, user, &*tx) self.check_user_is_channel_admin(from_parent, user, &*tx)
.await?; .await?;
@ -859,6 +867,12 @@ impl Database {
.await?; .await?;
} }
if let Some(to) = to {
self.check_user_is_channel_admin(to, user, &*tx).await?;
self.link_channel(from, to, &*tx).await?;
}
Ok(()) Ok(())
}) })
.await .await