[10.x] Ensuring Primary Reference on Retry in createOrFirst() (#48161)

* fix: 🐛 Ensuring Primary Reference on Retry in `createOrFirst()` * test: 💍 Fix tests * fix: 🐛 Apply `useWritePdo()` to all `createOrFirst` impls
laravel · Aug 27, 2023 · 27958eb · 27958eb
1 parent 3365194
commit 27958eb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -582,7 +582,7 @@ public function createOrFirst(array $attributes = [], array $values = [])
         try {
             return $this->withSavepointIfNeeded(fn () => $this->create(array_merge($attributes, $values)));
         } catch (UniqueConstraintViolationException $exception) {
-            return $this->where($attributes)->first();
+            return $this->useWritePdo()->where($attributes)->first();
         }
     }
 

diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -653,7 +653,7 @@ public function createOrFirst(array $attributes = [], array $values = [], array
                 $this->getQuery()->withSavepointIfNeeded(fn () => $this->attach($instance, $joining, $touch));
             });
         } catch (UniqueConstraintViolationException $exception) {
-            return (clone $this)->where($attributes)->first();
+            return (clone $this)->useWritePdo()->where($attributes)->first();
         }
     }
 

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -254,7 +254,7 @@ public function createOrFirst(array $attributes = [], array $values = [])
         try {
             return $this->getQuery()->withSavepointIfNeeded(fn () => $this->create(array_merge($attributes, $values)));
         } catch (UniqueConstraintViolationException $exception) {
-            return $this->where($attributes)->first();
+            return $this->useWritePdo()->where($attributes)->first();
         }
     }
 

diff --git a/tests/Database/DatabaseEloquentHasManyTest.php b/tests/Database/DatabaseEloquentHasManyTest.php
@@ -184,6 +184,7 @@ public function testCreateOrFirstMethodWithValuesFindsFirstModel()
         $relation->getQuery()->shouldReceive('withSavepointIfNeeded')->once()->andReturnUsing(function ($scope) {
             return $scope();
         });
+        $relation->getQuery()->shouldReceive('useWritePdo')->once()->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('where')->once()->with(['foo' => 'bar'])->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('first')->once()->with()->andReturn($model = m::mock(stdClass::class));
 

diff --git a/tests/Database/DatabaseEloquentMorphTest.php b/tests/Database/DatabaseEloquentMorphTest.php
@@ -230,6 +230,7 @@ public function testCreateOrFirstMethodFindsFirstModel()
         $relation->getQuery()->shouldReceive('withSavepointIfNeeded')->once()->andReturnUsing(function ($scope) {
             return $scope();
         });
+        $relation->getQuery()->shouldReceive('useWritePdo')->once()->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('where')->once()->with(['foo'])->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('first')->once()->with()->andReturn($model = m::mock(Model::class));
 
@@ -250,6 +251,7 @@ public function testCreateOrFirstMethodWithValuesFindsFirstModel()
         $relation->getQuery()->shouldReceive('withSavepointIfNeeded')->once()->andReturnUsing(function ($scope) {
             return $scope();
         });
+        $relation->getQuery()->shouldReceive('useWritePdo')->once()->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('where')->once()->with(['foo' => 'bar'])->andReturn($relation->getQuery());
         $relation->getQuery()->shouldReceive('first')->once()->with()->andReturn($model = m::mock(Model::class));