oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed an imprecise join in rejoin room (#2488)

Browse Source 
This fixed a pre-existing bug in rejoin room that got expanded to
stalling collab with the new git status feature.

Release Notes:

* N/A
This commit is contained in:
Mikayla Maki
2023-05-18 14:42:59 -07:00
committed by GitHub
parent 2883d6f1ef 99fcf23798
commit 87e206c451
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/collab/src/db.rs
+6
View File
@@ -1514,6 +1514,7 @@ impl Database {
let mut db_entries = worktree_entry::Entity::find()
.filter(
Condition::all()
.add(worktree_entry::Column::ProjectId.eq(project.id))
.add(worktree_entry::Column::WorktreeId.eq(worktree.id))
.add(entry_filter),
)
@@ -1553,6 +1554,7 @@ impl Database {
let mut db_repositories = worktree_repository::Entity::find()
.filter(
Condition::all()
.add(worktree_repository::Column::ProjectId.eq(project.id))
.add(worktree_repository::Column::WorktreeId.eq(worktree.id))
.add(repository_entry_filter),
)
@@ -1590,6 +1592,10 @@ impl Database {
worktree_repository_statuses::Entity::find()
.filter(
Condition::all()
.add(
worktree_repository_statuses::Column::ProjectId
.eq(project.id),
)
.add(
worktree_repository_statuses::Column::WorktreeId
.eq(worktree.id),