Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Feature/whereany closures #52555

Merged
merged 7 commits into from
Aug 22, 2024
Merged
Prev Previous commit
Next Next commit
Modify Builder::whereNone and Builder::orWhereNone to allow passing a…
…n array of closures
liamduckett committed Aug 22, 2024
commit 6fe3a327d8924451a6a6d15a6f733125b4b88059
4 changes: 2 additions & 2 deletions src/Illuminate/Database/Query/Builder.php
Original file line number Diff line number Diff line change
@@ -2312,7 +2312,7 @@ public function orWhereAny($columns, $operator = null, $value = null)
/**
* Add a "where not" clause to the query for multiple columns where none of the conditions should be true.
*
* @param \Illuminate\Contracts\Database\Query\Expression[]|string[] $columns
* @param \Illuminate\Contracts\Database\Query\Expression[]|string[]|\Closure[] $columns
* @param mixed $operator
* @param mixed $value
* @param string $boolean
@@ -2326,7 +2326,7 @@ public function whereNone($columns, $operator = null, $value = null, $boolean =
/**
* Add an "or where not" clause to the query for multiple columns where none of the conditions should be true.
*
* @param \Illuminate\Contracts\Database\Query\Expression[]|string[] $columns
* @param \Illuminate\Contracts\Database\Query\Expression[]|string[]|\Closure[] $columns
* @param mixed $operator
* @param mixed $value
* @return $this
16 changes: 16 additions & 0 deletions tests/Database/DatabaseQueryBuilderTest.php
Original file line number Diff line number Diff line change
@@ -1408,6 +1408,14 @@ public function testWhereNone()
$builder->select('*')->from('users')->where('first_name', 'like', '%Taylor%')->whereNone(['last_name', 'email'], 'like', '%Otwell%');
$this->assertSame('select * from "users" where "first_name" like ? and not ("last_name" like ? or "email" like ?)', $builder->toSql());
$this->assertEquals(['%Taylor%', '%Otwell%', '%Otwell%'], $builder->getBindings());

$builder = $this->getBuilder();
$builder->select('*')->from('users')->whereNone([
fn(Builder $query) => $query->where('last_name', 'like', '%Otwell%'),
fn(Builder $query) => $query->where('email', 'like', '%Otwell%'),
]);
$this->assertSame('select * from "users" where not (("last_name" like ?) or ("email" like ?))', $builder->toSql());
$this->assertEquals(['%Otwell%', '%Otwell%'], $builder->getBindings());
}

public function testOrWhereNone()
@@ -1426,6 +1434,14 @@ public function testOrWhereNone()
$builder->select('*')->from('users')->where('first_name', 'like', '%Taylor%')->orWhereNone(['last_name', 'email'], '%Otwell%');
$this->assertSame('select * from "users" where "first_name" like ? or not ("last_name" = ? or "email" = ?)', $builder->toSql());
$this->assertEquals(['%Taylor%', '%Otwell%', '%Otwell%'], $builder->getBindings());

$builder = $this->getBuilder();
$builder->select('*')->from('users')->where('first_name', 'like', '%Taylor%')->orWhereNone([
fn(Builder $query) => $query->where('last_name', 'like', '%Otwell%'),
fn(Builder $query) => $query->where('email', 'like', '%Otwell%'),
]);
$this->assertSame('select * from "users" where "first_name" like ? or not (("last_name" like ?) or ("email" like ?))', $builder->toSql());
$this->assertEquals(['%Taylor%', '%Otwell%', '%Otwell%'], $builder->getBindings());
}

public function testUnions()