[10.x] Fix createOrFirst on transactions

src/Illuminate/Database/Eloquent/Builder.php

@@ -580,7 +580,9 @@ public function firstOrCreate(array $attributes = [], array $values = [])
     public function createOrFirst(array $attributes = [], array $values = [])
     {
         try {
-            return $this->create(array_merge($attributes, $values));
+            return $this->withSavepointIfNeeded(function () use ($attributes, $values) {
+                return $this->create(array_merge($attributes, $values));
+            });
         } catch (UniqueConstraintViolationException $exception) {
             return $this->where($attributes)->first();
         }
@@ -2029,4 +2031,19 @@ public function __clone()
     {
         $this->query = clone $this->query;
     }
+
+    /**
+     * Wraps the given Closure with a transaction savepoint if needed.
+     *
+     * @template TModelValue
+     *
+     * @param  \Closure(): TModelValue  $scope
+     * @return TModelValue
+     */
+    public function withSavepointIfNeeded(Closure $scope): mixed
+    {
+        return $this->getQuery()->getConnection()->transactionLevel() > 0
+            ? $this->getQuery()->getConnection()->transaction($scope)
+            : $scope();
+    }
 }

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

@@ -643,14 +643,18 @@ public function firstOrCreate(array $attributes = [], array $values = [], array
     public function createOrFirst(array $attributes = [], array $values = [], array $joining = [], $touch = true)
     {
         try {
-            return $this->create(array_merge($attributes, $values), $joining, $touch);
+            return $this->getQuery()->withSavePointIfNeeded(function () use ($attributes, $values, $joining, $touch) {
+                return $this->create(array_merge($attributes, $values), $joining, $touch);
+            });
         } catch (UniqueConstraintViolationException $exception) {
             // ...
         }
 
         try {
             return tap($this->related->where($attributes)->first(), function ($instance) use ($joining, $touch) {
-                $this->attach($instance, $joining, $touch);
+                $this->getQuery()->withSavepointIfNeeded(function () use ($instance, $joining, $touch) {
+                    $this->attach($instance, $joining, $touch);
+                });
             });
         } catch (UniqueConstraintViolationException $exception) {
             return (clone $this)->where($attributes)->first();

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

@@ -252,7 +252,9 @@ public function firstOrCreate(array $attributes = [], array $values = [])
     public function createOrFirst(array $attributes = [], array $values = [])
     {
         try {
-            return $this->create(array_merge($attributes, $values));
+            return $this->getQuery()->withSavepointIfNeeded(function () use ($attributes, $values) {
+                return $this->create(array_merge($attributes, $values));
+            });
         } catch (UniqueConstraintViolationException $exception) {
             return $this->where($attributes)->first();
         }

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -552,6 +552,22 @@ public function testCreateOrFirst()
         $this->assertSame('Nuno Maduro', $user4->name);
     }
 
+    public function testCreateOrFirstWithinTransaction()
+    {
+        $user1 = EloquentTestUniqueUser::create(['email' => 'taylorotwell@gmail.com']);
+
+        DB::transaction(function () use ($user1) {
+            $user2 = EloquentTestUniqueUser::createOrFirst(
+                ['email' => 'taylorotwell@gmail.com'],
+                ['name' => 'Taylor Otwell']
+            );
+
+            $this->assertEquals($user1->id, $user2->id);
+            $this->assertSame('taylorotwell@gmail.com', $user2->email);
+            $this->assertNull($user2->name);
+        });
+    }
+
     public function testUpdateOrCreate()
     {
         $user1 = EloquentTestUser::create(['email' => 'taylorotwell@gmail.com']);

tests/Integration/Database/EloquentBelongsToManyTest.php

@@ -629,6 +629,19 @@ public function testCreateOrFirstUnrelatedExisting()
         $this->assertTrue($tag->is($post->tagsUnique()->first()));
     }
 
+    public function testCreateOrFirstWithinTransaction()
+    {
+        $post = Post::create(['title' => Str::random()]);
+
+        $tag = UniqueTag::create(['name' => Str::random()]);
+
+        $post->tagsUnique()->attach(UniqueTag::all());
+
+        DB::transaction(function () use ($tag, $post) {
+            $this->assertEquals($tag->id, $post->tagsUnique()->createOrFirst(['name' => $tag->name])->id);
+        });
+    }
+
     public function testFirstOrNewMethodWithValues()
     {
         $post = Post::create(['title' => Str::random()]);

tests/Integration/Database/EloquentHasManyTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 
@@ -70,6 +71,21 @@ public function testCreateOrFirst()
         $this->assertTrue($post1->is($post2));
         $this->assertCount(1, $user->posts()->get());
     }
+
+    public function testCreateOrFirstWithinTransaction()
+    {
+        $user = EloquentHasManyTestUser::create();
+
+        $post1 = $user->posts()->create(['title' => Str::random()]);
+
+        DB::transaction(function () use ($user, $post1) {
+            $post2 = $user->posts()->createOrFirst(['title' => $post1->title]);
+
+            $this->assertTrue($post1->is($post2));
+        });
+
+        $this->assertCount(1, $user->posts()->get());
+    }
 }
 
 class EloquentHasManyTestUser extends Model

tests/Integration/Database/MySql/DatabaseEloquentMySqlIntegrationTest.php

@@ -5,9 +5,14 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Tests\Integration\Database\WithEloquentIntegrationTests;
 
 class DatabaseEloquentMySqlIntegrationTest extends MySqlTestCase
 {
+    use WithEloquentIntegrationTests;
+
+    protected $eloquentModelClass = DatabaseEloquentMySqlIntegrationUser::class;
+
     protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
     {
         if (! Schema::hasTable('database_eloquent_mysql_integration_users')) {
@@ -24,39 +29,6 @@ protected function destroyDatabaseMigrations()
     {
         Schema::drop('database_eloquent_mysql_integration_users');
     }
-
-    public function testCreateOrFirst()
-    {
-        $user1 = DatabaseEloquentMySqlIntegrationUser::createOrFirst(['email' => 'taylorotwell@gmail.com']);
-
-        $this->assertSame('taylorotwell@gmail.com', $user1->email);
-        $this->assertNull($user1->name);
-
-        $user2 = DatabaseEloquentMySqlIntegrationUser::createOrFirst(
-            ['email' => 'taylorotwell@gmail.com'],
-            ['name' => 'Taylor Otwell']
-        );
-
-        $this->assertEquals($user1->id, $user2->id);
-        $this->assertSame('taylorotwell@gmail.com', $user2->email);
-        $this->assertNull($user2->name);
-
-        $user3 = DatabaseEloquentMySqlIntegrationUser::createOrFirst(
-            ['email' => 'abigailotwell@gmail.com'],
-            ['name' => 'Abigail Otwell']
-        );
-
-        $this->assertNotEquals($user3->id, $user1->id);
-        $this->assertSame('abigailotwell@gmail.com', $user3->email);
-        $this->assertSame('Abigail Otwell', $user3->name);
-
-        $user4 = DatabaseEloquentMySqlIntegrationUser::createOrFirst(
-            ['name' => 'Dries Vints'],
-            ['name' => 'Nuno Maduro', 'email' => 'nuno@laravel.com']
-        );
-
-        $this->assertSame('Nuno Maduro', $user4->name);
-    }
 }
 
 class DatabaseEloquentMySqlIntegrationUser extends Model

tests/Integration/Database/Postgres/DatabaseEloquentPostgresIntegrationTest.php

@@ -5,9 +5,14 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Tests\Integration\Database\WithEloquentIntegrationTests;
 
 class DatabaseEloquentPostgresIntegrationTest extends PostgresTestCase
 {
+    use WithEloquentIntegrationTests;
+
+    protected $eloquentModelClass = DatabaseEloquentPostgresIntegrationUser::class;
+
     protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
     {
         if (! Schema::hasTable('database_eloquent_postgres_integration_users')) {
@@ -24,39 +29,6 @@ protected function destroyDatabaseMigrations()
     {
         Schema::drop('database_eloquent_postgres_integration_users');
     }
-
-    public function testCreateOrFirst()
-    {
-        $user1 = DatabaseEloquentPostgresIntegrationUser::createOrFirst(['email' => 'taylorotwell@gmail.com']);
-
-        $this->assertSame('taylorotwell@gmail.com', $user1->email);
-        $this->assertNull($user1->name);
-
-        $user2 = DatabaseEloquentPostgresIntegrationUser::createOrFirst(
-            ['email' => 'taylorotwell@gmail.com'],
-            ['name' => 'Taylor Otwell']
-        );
-
-        $this->assertEquals($user1->id, $user2->id);
-        $this->assertSame('taylorotwell@gmail.com', $user2->email);
-        $this->assertNull($user2->name);
-
-        $user3 = DatabaseEloquentPostgresIntegrationUser::createOrFirst(
-            ['email' => 'abigailotwell@gmail.com'],
-            ['name' => 'Abigail Otwell']
-        );
-
-        $this->assertNotEquals($user3->id, $user1->id);
-        $this->assertSame('abigailotwell@gmail.com', $user3->email);
-        $this->assertSame('Abigail Otwell', $user3->name);
-
-        $user4 = DatabaseEloquentPostgresIntegrationUser::createOrFirst(
-            ['name' => 'Dries Vints'],
-            ['name' => 'Nuno Maduro', 'email' => 'nuno@laravel.com']
-        );
-
-        $this->assertSame('Nuno Maduro', $user4->name);
-    }
 }
 
 class DatabaseEloquentPostgresIntegrationUser extends Model

tests/Integration/Database/SqlServer/DatabaseEloquentSqlServerIntegrationTest.php

@@ -5,9 +5,14 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Tests\Integration\Database\WithEloquentIntegrationTests;
 
 class DatabaseEloquentSqlServerIntegrationTest extends SqlServerTestCase
 {
+    use WithEloquentIntegrationTests;
+
+    protected $eloquentModelClass = DatabaseEloquentSqlServerIntegrationUser::class;
+
     protected function defineDatabaseMigrationsAfterDatabaseRefreshed()
     {
         if (! Schema::hasTable('database_eloquent_sql_server_integration_users')) {
@@ -24,39 +29,6 @@ protected function destroyDatabaseMigrations()
     {
         Schema::drop('database_eloquent_sql_server_integration_users');
     }
-
-    public function testCreateOrFirst()
-    {
-        $user1 = DatabaseEloquentSqlServerIntegrationUser::createOrFirst(['email' => 'taylorotwell@gmail.com']);
-
-        $this->assertSame('taylorotwell@gmail.com', $user1->email);
-        $this->assertNull($user1->name);
-
-        $user2 = DatabaseEloquentSqlServerIntegrationUser::createOrFirst(
-            ['email' => 'taylorotwell@gmail.com'],
-            ['name' => 'Taylor Otwell']
-        );
-
-        $this->assertEquals($user1->id, $user2->id);
-        $this->assertSame('taylorotwell@gmail.com', $user2->email);
-        $this->assertNull($user2->name);
-
-        $user3 = DatabaseEloquentSqlServerIntegrationUser::createOrFirst(
-            ['email' => 'abigailotwell@gmail.com'],
-            ['name' => 'Abigail Otwell']
-        );
-
-        $this->assertNotEquals($user3->id, $user1->id);
-        $this->assertSame('abigailotwell@gmail.com', $user3->email);
-        $this->assertSame('Abigail Otwell', $user3->name);
-
-        $user4 = DatabaseEloquentSqlServerIntegrationUser::createOrFirst(
-            ['name' => 'Dries Vints'],
-            ['name' => 'Nuno Maduro', 'email' => 'nuno@laravel.com']
-        );
-
-        $this->assertSame('Nuno Maduro', $user4->name);
-    }
 }
 
 class DatabaseEloquentSqlServerIntegrationUser extends Model

tests/Integration/Database/WithEloquentIntegrationTests.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Database;
+
+use Illuminate\Support\Facades\DB;
+
+trait WithEloquentIntegrationTests
+{
+    public function testCreateOrFirst()
+    {
+        $user1 = $this->eloquentModelClass::createOrFirst(['email' => 'taylorotwell@gmail.com']);
+
+        $this->assertSame('taylorotwell@gmail.com', $user1->email);
+        $this->assertNull($user1->name);
+
+        $user2 = $this->eloquentModelClass::createOrFirst(
+            ['email' => 'taylorotwell@gmail.com'],
+            ['name' => 'Taylor Otwell']
+        );
+
+        $this->assertEquals($user1->id, $user2->id);
+        $this->assertSame('taylorotwell@gmail.com', $user2->email);
+        $this->assertNull($user2->name);
+
+        $user3 = $this->eloquentModelClass::createOrFirst(
+            ['email' => 'abigailotwell@gmail.com'],
+            ['name' => 'Abigail Otwell']
+        );
+
+        $this->assertNotEquals($user3->id, $user1->id);
+        $this->assertSame('abigailotwell@gmail.com', $user3->email);
+        $this->assertSame('Abigail Otwell', $user3->name);
+
+        $user4 = $this->eloquentModelClass::createOrFirst(
+            ['name' => 'Dries Vints'],
+            ['name' => 'Nuno Maduro', 'email' => 'nuno@laravel.com']
+        );
+
+        $this->assertSame('Nuno Maduro', $user4->name);
+    }
+
+    public function testCreateOrFirstWithinTransaction()
+    {
+        $user1 = $this->eloquentModelClass::createOrFirst(['email' => 'taylor@laravel.com']);
+
+        DB::transaction(function () use ($user1) {
+            $user2 = $this->eloquentModelClass::createOrFirst(
+                ['email' => 'taylor@laravel.com'],
+                ['name' => 'Taylor Otwell']
+            );
+
+            $this->assertEquals($user1->id, $user2->id);
+            $this->assertSame('taylor@laravel.com', $user2->email);
+            $this->assertNull($user2->name);
+        });
+    }
+}