[5.1] Add Model::saveOrFail() to execute save operation within database transaction.

src/Illuminate/Database/Eloquent/Model.php

@@ -4,6 +4,7 @@
 
 use DateTime;
 use Exception;
+use Throwable;
 use ArrayAccess;
 use Carbon\Carbon;
 use LogicException;
@@ -1521,6 +1522,38 @@ public function save(array $options = [])
         return $saved;
     }
 
+    /**
+     * Save the model to the database using transaction.
+     *
+     * @param  array  $options
+     * @return bool
+     *
+     * @throws \Throwable
+     */
+    public function saveOrFail(array $options = [])
+    {
+        $db = $this->getConnection();
+        $result = false;
+
+        $db->beginTransaction();
+
+        try {
+            $result = $this->save($options);
+
+            $db->commit();
+        } catch (Exception $e) {
+            $db->rollBack();
+
+            throw $e;
+        } catch (Throwable $e) {
+            $db->rollBack();
+
+            throw $e;
+        }
+
+        return $result;
+    }
+
     /**
      * Finish processing on a successful save operation.
      *

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -431,6 +431,34 @@ public function testEmptyMorphToRelationship()
         $this->assertNull($photo->imageable);
     }
 
+    public function testSaveOrFail()
+    {
+        $date = '1970-01-01';
+        $post = new EloquentTestPost([
+            'user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date,
+        ]);
+
+        $this->assertTrue($post->saveOrFail());
+        $this->assertEquals(1, EloquentTestPost::count());
+    }
+
+    /**
+     * @expectedException Exception
+     */
+    public function testSaveOrFailWithDuplicatedEntry()
+    {
+        $date = '1970-01-01';
+        EloquentTestPost::create([
+            'id' => 1, 'user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date,
+        ]);
+
+        $post = new EloquentTestPost([
+            'id' => 1, 'user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date,
+        ]);
+
+        $post->saveOrFail();
+    }
+
     public function testMultiInsertsWithDifferentValues()
     {
         $date = '1970-01-01';
@@ -473,6 +501,41 @@ public function testNestedTransactions()
         });
     }
 
+    public function testNestedTransactionsUsingSaveOrFailWillSucceed()
+    {
+        $user = EloquentTestUser::create(['email' => '[email protected]']);
+        $this->connection()->transaction(function () use ($user) {
+            try {
+                $user->email = '[email protected]';
+                $user->saveOrFail();
+            } catch (Exception $e) {
+                // ignore the exception
+            }
+
+            $user = EloquentTestUser::first();
+            $this->assertEquals('[email protected]', $user->email);
+            $this->assertEquals(1, $user->id);
+        });
+    }
+
+    public function testNestedTransactionsUsingSaveOrFailWillFails()
+    {
+        $user = EloquentTestUser::create(['email' => '[email protected]']);
+        $this->connection()->transaction(function () use ($user) {
+            try {
+                $user->id = 'invalid';
+                $user->email = '[email protected]';
+                $user->saveOrFail();
+            } catch (Exception $e) {
+                // ignore the exception
+            }
+
+            $user = EloquentTestUser::first();
+            $this->assertEquals('[email protected]', $user->email);
+            $this->assertEquals(1, $user->id);
+        });
+    }
+
     public function testToArrayIncludesDefaultFormattedTimestamps()
     {
         $model = new EloquentTestUser;