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

Use Db::get_guest_connection_ids in other db methods

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-17 11:38:00 +01:00
parent 9eee22ff0a
commit 532a599239
1 changed files with 6 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
crates/collab/src/db.rs
View file

@ -1771,24 +1771,9 @@ where
query.execute(&mut tx).await?;
}
let connection_ids = sqlx::query_scalar::<_, i32>(
"
SELECT connection_id
FROM project_collaborators
WHERE project_id = $1 AND connection_id != $2
",
)
.bind(project_id)
.bind(connection_id.0 as i32)
.fetch_all(&mut tx)
.await?;
let connection_ids = self.get_guest_connection_ids(project_id, &mut tx).await?;
tx.commit().await?;
Ok(connection_ids
.into_iter()
.map(|connection_id| ConnectionId(connection_id as u32))
.collect())
Ok(connection_ids)
})
.await
}
@ -1846,24 +1831,9 @@ where
.execute(&mut tx)
.await?;
let connection_ids = sqlx::query_scalar::<_, i32>(
"
SELECT connection_id
FROM project_collaborators
WHERE project_id = $1 AND connection_id != $2
",
)
.bind(project_id)
.bind(connection_id.0 as i32)
.fetch_all(&mut tx)
.await?;
let connection_ids = self.get_guest_connection_ids(project_id, &mut tx).await?;
tx.commit().await?;
Ok(connection_ids
.into_iter()
.map(|connection_id| ConnectionId(connection_id as u32))
.collect())
Ok(connection_ids)
})
.await
}
@ -1908,24 +1878,9 @@ where
.execute(&mut tx)
.await?;
let connection_ids = sqlx::query_scalar::<_, i32>(
"
SELECT connection_id
FROM project_collaborators
WHERE project_id = $1 AND connection_id != $2
",
)
.bind(project_id)
.bind(connection_id.0 as i32)
.fetch_all(&mut tx)
.await?;
let connection_ids = self.get_guest_connection_ids(project_id, &mut tx).await?;
tx.commit().await?;
Ok(connection_ids
.into_iter()
.map(|connection_id| ConnectionId(connection_id as u32))
.collect())
Ok(connection_ids)
})
.await
}