Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an imprecise join in rejoin room

Browse source
This commit is contained in:
Mikayla Maki 2023-05-18 14:29:18 -07:00
parent 2883d6f1ef
commit 95a7d69bce
No known key found for this signature in database
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1514,6 +1514,7 @@ impl Database {
let mut db_entries = worktree_entry::Entity::find() let mut db_entries = worktree_entry::Entity::find()
.filter( .filter(
Condition::all() Condition::all()
.add(worktree_entry::Column::ProjectId.eq(project.id))
.add(worktree_entry::Column::WorktreeId.eq(worktree.id)) .add(worktree_entry::Column::WorktreeId.eq(worktree.id))
.add(entry_filter), .add(entry_filter),
) )
@ -1553,6 +1554,7 @@ impl Database {
let mut db_repositories = worktree_repository::Entity::find() let mut db_repositories = worktree_repository::Entity::find()
.filter( .filter(
Condition::all() Condition::all()
.add(worktree_repository::Column::ProjectId.eq(project.id))
.add(worktree_repository::Column::WorktreeId.eq(worktree.id)) .add(worktree_repository::Column::WorktreeId.eq(worktree.id))
.add(repository_entry_filter), .add(repository_entry_filter),
) )
@ -1590,6 +1592,7 @@ impl Database {
worktree_repository_statuses::Entity::find() worktree_repository_statuses::Entity::find()
.filter( .filter(
Condition::all() Condition::all()
.add(worktree_repository_statuses::Column::ProjectId.eq(project.id))
.add( .add(
worktree_repository_statuses::Column::WorktreeId worktree_repository_statuses::Column::WorktreeId
.eq(worktree.id), .eq(worktree.id),