Repository navigation
[6.x] Respect collection wheres inside nested where closures - #15563
Merged
jasonvarga merged 1 commit intoOct 5, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request fixes an issue where
where('collection', ...)orwhereIn('collection', ...)inside a nestedwhere()/orWhere()closure was silently ignored by the Stache entry query builder.The builder pulls collection clauses out of the wheres and keeps them in its
$collectionsproperty, so they decide which collection stores get queried. The closure gets a clone of the builder, so the clause landed on the clone's$collections, which is never read. The nested query ended up with no wheres and was dropped, and entries from every collection came back.This PR fixes it by marking the nested builder, and turning collection clauses on it into a regular where on the
collectionHandleindex, the same index the status query already uses for its per-collection clauses. That wayand/orinside the closure work like any other column.Fixes #15560