[12.x] Fix orWhere() with array syntax to join conditions with AND #57511
+15
−15
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
This fixes a regression where `orWhere()` with array syntax was incorrectly
joining multiple array conditions with OR instead of AND, breaking backward
compatibility from Laravel 5.4+.
**Problem:**
```php
->where('status', 'Queued')
->orWhere([
['status', '=', 'On Water'],
['checkout_date', '!=', '']
])
```
Previously generated (correct):
```sql
WHERE status = ? OR (status = ? AND checkout_date != ?)
```
After regression, generated (incorrect):
```sql
WHERE status = ? OR (status = ? OR checkout_date != ?)
```
**Root Cause:**
The `addArrayOfWheres()` method was passing the `$boolean` parameter ('or')
to each individual condition inside the array, when it should only control
how the entire group connects to previous clauses.
**Solution:**
Array items are now always joined with AND (the natural behavior of "where"),
while the `$boolean` parameter only controls how the nested group connects
to the rest of the query.
Fixes laravel#53628
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <[email protected]>
|
See #53197 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Issue: #53628 - orWhere() with array syntax was generating OR between array items instead of AND.
The Bug
->where('status', 'Queued')
->orWhere([
['status', '=', 'On Water'],
['checkout_date', '!=', '']
])
Was generating (WRONG):
WHERE status = ? OR (status = ? OR checkout_date != ?)
Now generates (CORRECT):
WHERE status = ? OR (status = ? AND checkout_date != ?)
🔧 The Fix
Modified Builder.php:928-939 to remove the $boolean parameter from individual array items. Now the $boolean only controls how the group connects to previous clauses, not how items inside the array are joined.
This pull request updates the handling of array-based conditions in the query builder, specifically changing how multiple conditions within an array are combined. Previously, these conditions were joined using the
ORoperator, but now they are joined using theANDoperator. This affects both the query generation logic and the associated tests to ensure consistent results.