From bb5bfb807a00e452e7a21de4e0474294e44a1e0e Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Wed, 21 Sep 2016 16:19:52 +0200 Subject: [PATCH 1/2] Remove the condition from updateOrInsert since it's added already --- src/Illuminate/Database/Query/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php index 2fe3f0ba6b6b..ba20e42c68b8 100755 --- a/src/Illuminate/Database/Query/Builder.php +++ b/src/Illuminate/Database/Query/Builder.php @@ -2172,7 +2172,7 @@ public function updateOrInsert(array $attributes, array $values = []) return $this->insert(array_merge($attributes, $values)); } - return (bool) $this->where($attributes)->take(1)->update($values); + return (bool) $this->take(1)->update($values); } /** From e0f4af76d2fd9ad7e36dcd53c4fa9c456944524f Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Wed, 21 Sep 2016 17:07:39 +0200 Subject: [PATCH 2/2] fix test --- tests/Database/DatabaseQueryBuilderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php index 3f36254cce8f..fb7a1ae2e826 100755 --- a/tests/Database/DatabaseQueryBuilderTest.php +++ b/tests/Database/DatabaseQueryBuilderTest.php @@ -1286,7 +1286,7 @@ public function testUpdateOrInsertMethod() m::mock('Illuminate\Database\Query\Processors\Processor'), ]); - $builder->shouldReceive('where')->twice()->with(['email' => 'foo'])->andReturn(m::self()); + $builder->shouldReceive('where')->once()->with(['email' => 'foo'])->andReturn(m::self()); $builder->shouldReceive('exists')->once()->andReturn(true); $builder->shouldReceive('take')->andReturnSelf(); $builder->shouldReceive('update')->once()->with(['name' => 'bar'])->andReturn(1);