[12.x] Refactor Query Builder: Extract shared logic from whereAny
and whereAll
into a reusable method
#55290
+21
−14
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 PR refactors the
Query\Builder
class to eliminate duplicated logic between thewhereAny
andwhereAll
methods.Both methods were doing the same thing internally — looping over the columns and applying a where clause — with only the boolean (
or
vsand
) being different. That repeated logic has now been pulled into a new internal method:addNestedWhereGroup
.Before
Both
whereAny
andwhereAll
had almost identical code blocks for building nested conditions. This made the code harder to maintain and more error-prone when changes were needed.After
Now both methods delegate to
addNestedWhereGroup
, which handles the common logic. This keeps things cleaner, more maintainable, and easier to reason about.