From 95a7d69bce670e61391287214a45e431c4420daa Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Thu, 18 May 2023 14:29:18 -0700 Subject: [PATCH] Fixed an imprecise join in rejoin room --- crates/collab/src/db.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index 453aa82b536b21b25a1b8fe8c6d69f319ac5484b..95886709b386cefbb2bcf7fd3e03e05f2eab11ba 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -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,7 @@ 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),