[10.x] HotFix: throw captured UniqueConstraintViolationException if there are no matching records on SELECT retry

src/Illuminate/Database/Eloquent/Builder.php

@@ -581,8 +581,8 @@ public function createOrFirst(array $attributes = [], array $values = [])
     {
         try {
             return $this->withSavepointIfNeeded(fn () => $this->create(array_merge($attributes, $values)));
-        } catch (UniqueConstraintViolationException) {
-            return $this->useWritePdo()->where($attributes)->first();
+        } catch (UniqueConstraintViolationException $e) {
+            return $this->useWritePdo()->where($attributes)->first() ?? throw $e;
         }
     }
 

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

@@ -648,16 +648,16 @@ public function createOrFirst(array $attributes = [], array $values = [], array
     {
         try {
             return $this->getQuery()->withSavePointIfNeeded(fn () => $this->create(array_merge($attributes, $values), $joining, $touch));
-        } catch (UniqueConstraintViolationException $exception) {
+        } catch (UniqueConstraintViolationException $e) {
             // ...
         }
 
         try {
-            return tap($this->related->where($attributes)->first(), function ($instance) use ($joining, $touch) {
+            return tap($this->related->where($attributes)->first() ?? throw $e, function ($instance) use ($joining, $touch) {
                 $this->getQuery()->withSavepointIfNeeded(fn () => $this->attach($instance, $joining, $touch));
             });
-        } catch (UniqueConstraintViolationException) {
-            return (clone $this)->useWritePdo()->where($attributes)->first();
+        } catch (UniqueConstraintViolationException $e) {
+            return (clone $this)->useWritePdo()->where($attributes)->first() ?? throw $e;
         }
     }
 

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

@@ -253,8 +253,8 @@ public function createOrFirst(array $attributes = [], array $values = [])
     {
         try {
             return $this->getQuery()->withSavepointIfNeeded(fn () => $this->create(array_merge($attributes, $values)));
-        } catch (UniqueConstraintViolationException) {
-            return $this->useWritePdo()->where($attributes)->first();
+        } catch (UniqueConstraintViolationException $e) {
+            return $this->useWritePdo()->where($attributes)->first() ?? throw $e;
         }
     }
 

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -16,6 +16,7 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Database\QueryException;
+use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Pagination\AbstractPaginator as Paginator;
 use Illuminate\Pagination\Cursor;
 use Illuminate\Pagination\CursorPaginator;
@@ -91,6 +92,8 @@ protected function createSchema()
             $this->schema($connection)->create('unique_users', function ($table) {
                 $table->increments('id');
                 $table->string('name')->nullable();
+                // Unique constraint will be applied only for non-null values
+                $table->string('screen_name')->nullable()->unique();
                 $table->string('email')->unique();
                 $table->timestamp('birthday', 6)->nullable();
                 $table->timestamps();
@@ -552,6 +555,27 @@ public function testCreateOrFirst()
         $this->assertSame('Nuno Maduro', $user4->name);
     }
 
+    public function testCreateOrFirstNonAttributeFieldViolation()
+    {
+        // 'email' and 'screen_name' are unique and independent of each other.
+        EloquentTestUniqueUser::create([
+            'email' => '[email protected]',
+            'screen_name' => '@taylorotwell',
+        ]);
+
+        $this->expectException(UniqueConstraintViolationException::class);
+
+        // Although 'email' is expected to be unique and is passed as $attributes,
+        // if the 'screen_name' attribute listed in non-unique $values causes a violation,
+        // a UniqueConstraintViolationException should be thrown.
+        EloquentTestUniqueUser::createOrFirst(
+            ['email' => '[email protected]'],
+            [
+                'screen_name' => '@taylorotwell',
+            ]
+        );
+    }
+
     public function testCreateOrFirstWithinTransaction()
     {
         $user1 = EloquentTestUniqueUser::create(['email' => '[email protected]']);