[10.x] Fix duplicate conditions on retrying SELECT calls under createOrFirst() (#48725)

* fix: duplicate conditions with `firstOrCreate` and `createOrFirst`

* fix: missing mocks due to additional code

Author: KentarouTakeda

src/Illuminate/Database/Eloquent/Builder.php

@@ -563,7 +563,7 @@ public function firstOrNew(array $attributes = [], array $values = [])
      */
     public function firstOrCreate(array $attributes = [], array $values = [])
     {
-        if (! is_null($instance = $this->where($attributes)->first())) {
+        if (! is_null($instance = (clone $this)->where($attributes)->first())) {
             return $instance;
         }
 

src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php

@@ -273,7 +273,7 @@ public function firstOrNew(array $attributes = [], array $values = [])
      */
     public function firstOrCreate(array $attributes = [], array $values = [])
     {
-        if (! is_null($instance = $this->where($attributes)->first())) {
+        if (! is_null($instance = (clone $this)->where($attributes)->first())) {
             return $instance;
         }
 

src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php

@@ -235,7 +235,7 @@ public function firstOrNew(array $attributes = [], array $values = [])
      */
     public function firstOrCreate(array $attributes = [], array $values = [])
     {
-        if (is_null($instance = $this->where($attributes)->first())) {
+        if (is_null($instance = (clone $this)->where($attributes)->first())) {
             $instance = $this->createOrFirst($attributes, $values);
         }
 

tests/Database/DatabaseEloquentBuilderCreateOrFirstTest.php

@@ -165,8 +165,7 @@ public function testFirstOrCreateMethodRetrievesRecordCreatedJustNow(): void
 
         $model->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
-            ->with('select * from "table" where ("attr" = ?) and ("attr" = ?) limit 1', ['foo', 'foo'], false)
+            ->with('select * from "table" where ("attr" = ?) limit 1', ['foo'], false)
             ->andReturn([[
                 'id' => 123,
                 'attr' => 'foo',
@@ -273,8 +272,7 @@ public function testUpdateOrCreateMethodUpdatesRecordCreatedJustNow(): void
 
         $model->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
-            ->with('select * from "table" where ("attr" = ?) and ("attr" = ?) limit 1', ['foo', 'foo'], false)
+            ->with('select * from "table" where ("attr" = ?) limit 1', ['foo'], false)
             ->andReturn([[
                 'id' => 123,
                 'attr' => 'foo',

tests/Database/DatabaseEloquentHasManyCreateOrFirstTest.php

@@ -177,8 +177,7 @@ public function testFirstOrCreateMethodRetrievesRecordCreatedJustNow(): void
 
         $model->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
-            ->with('select * from "child_table" where "child_table"."parent_id" = ? and "child_table"."parent_id" is not null and ("attr" = ?) and ("attr" = ?) limit 1', [123, 'foo', 'foo'], false)
+            ->with('select * from "child_table" where "child_table"."parent_id" = ? and "child_table"."parent_id" is not null and ("attr" = ?) limit 1', [123, 'foo'], false)
             ->andReturn([[
                 'id' => 456,
                 'parent_id' => 123,
@@ -290,8 +289,7 @@ public function testUpdateOrCreateMethodUpdatesRecordCreatedJustNow(): void
 
         $model->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
-            ->with('select * from "child_table" where "child_table"."parent_id" = ? and "child_table"."parent_id" is not null and ("attr" = ?) and ("attr" = ?) limit 1', [123, 'foo', 'foo'], false)
+            ->with('select * from "child_table" where "child_table"."parent_id" = ? and "child_table"."parent_id" is not null and ("attr" = ?) limit 1', [123, 'foo'], false)
             ->andReturn([[
                 'id' => 456,
                 'parent_id' => 123,

tests/Database/DatabaseEloquentHasManyTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -343,7 +344,8 @@ public function testCreateManyCreatesARelatedModelForEachRecord()
 
     protected function getRelation()
     {
-        $builder = m::mock(Builder::class);
+        $queryBuilder = m::mock(QueryBuilder::class);
+        $builder = m::mock(Builder::class, [$queryBuilder]);
         $builder->shouldReceive('whereNotNull')->with('table.foreign_key');
         $builder->shouldReceive('where')->with('table.foreign_key', '=', 1);
         $related = m::mock(Model::class);

tests/Database/DatabaseEloquentHasManyThroughCreateOrFirstTest.php

@@ -196,10 +196,9 @@ public function testFirstOrCreateMethodRetrievesRecordCreatedJustNow(): void
 
         $parent->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
             ->with(
-                'select "child".*, "pivot"."parent_id" as "laravel_through_key" from "child" inner join "pivot" on "pivot"."id" = "child"."pivot_id" where "pivot"."parent_id" = ? and ("attr" = ?) and ("attr" = ? and "val" = ?) limit 1',
-                [123, 'foo', 'foo', 'bar'],
+                'select "child".*, "pivot"."parent_id" as "laravel_through_key" from "child" inner join "pivot" on "pivot"."id" = "child"."pivot_id" where "pivot"."parent_id" = ? and ("attr" = ? and "val" = ?) limit 1',
+                [123, 'foo', 'bar'],
                 true,
             )
             ->andReturn([[
@@ -334,10 +333,9 @@ public function testUpdateOrCreateMethodUpdatesRecordCreatedJustNow(): void
 
         $parent->getConnection()
             ->expects('select')
-            // FIXME: duplicate conditions
             ->with(
-                'select "child".*, "pivot"."parent_id" as "laravel_through_key" from "child" inner join "pivot" on "pivot"."id" = "child"."pivot_id" where "pivot"."parent_id" = ? and ("attr" = ?) and ("attr" = ? and "val" = ?) limit 1',
-                [123, 'foo', 'foo', 'bar'],
+                'select "child".*, "pivot"."parent_id" as "laravel_through_key" from "child" inner join "pivot" on "pivot"."id" = "child"."pivot_id" where "pivot"."parent_id" = ? and ("attr" = ? and "val" = ?) limit 1',
+                [123, 'foo', 'bar'],
                 true,
             )
             ->andReturn([[

tests/Database/DatabaseEloquentMorphTest.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -443,7 +444,8 @@ public function testIsNotModelWithAnotherConnection()
 
     protected function getOneRelation()
     {
-        $builder = m::mock(Builder::class);
+        $queryBuilder = m::mock(QueryBuilder::class);
+        $builder = m::mock(Builder::class, [$queryBuilder]);
         $builder->shouldReceive('whereNotNull')->once()->with('table.morph_id');
         $builder->shouldReceive('where')->once()->with('table.morph_id', '=', 1);
         $related = m::mock(Model::class);