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

Fix query errors in Db::share_project

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-14 10:53:11 +01:00
parent 9902211af1
commit 0310e27347
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1296,10 +1296,11 @@ where
SELECT projects.id, worktrees.root_name
FROM projects
LEFT JOIN worktrees ON projects.id = worktrees.project_id
WHERE room_id = $1 AND host_user_id = $2
WHERE room_id = $1 AND host_connection_id = $2
",
)
.bind(room_id)
.bind(participant.peer_id as i32)
.fetch(&mut *tx);
let mut projects = HashMap::default();
@ -1341,14 +1342,14 @@ where
let mut tx = self.pool.begin().await?;
let project_id = sqlx::query_scalar(
"
INSERT INTO projects (host_user_id, host_connection_id, room_id)
INSERT INTO projects (room_id, host_user_id, host_connection_id)
VALUES ($1, $2, $3)
RETURNING id
",
)
.bind(room_id)
.bind(user_id)
.bind(connection_id.0 as i32)
.bind(room_id)
.fetch_one(&mut tx)
.await
.map(ProjectId)?;
@ -1356,7 +1357,8 @@ where
for worktree in worktrees {
sqlx::query(
"
INSERT INTO worktrees (id, project_id, root_name)
INSERT INTO worktrees (id, project_id, root_name)
VALUES ($1, $2, $3)
",
)
.bind(worktree.id as i32)
@ -1387,6 +1389,7 @@ where
.await?;
let room = self.commit_room_transaction(room_id, tx).await?;
dbg!(&room);
Ok((project_id, room))
})
}

3
crates/collab/src/rpc.rs
View file

@ -849,7 +849,8 @@ impl Server {
RoomId::from_proto(request.payload.room_id),
&request.payload.worktrees,
)
.await?;
.await
.unwrap();
response.send(proto::ShareProjectResponse {
project_id: project_id.to_proto(),
})?;