Merge branch '5.5' into 5.6

laravel · Jan 12, 2018 · 33ea741 · 33ea741
2 parents 468cb1b + e36c639
commit 33ea741
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Migrations/Migration.php b/src/Illuminate/Database/Migrations/Migration.php
@@ -11,6 +11,13 @@ abstract class Migration
      */
     protected $connection;
 
+    /**
+     * Enables, if supported, wrapping the migration within a transaction.
+     *
+     * @var bool
+     */
+    public $withinTransaction = true;
+
     /**
      * Get the migration connection name.
      *

diff --git a/src/Illuminate/Database/Migrations/Migrator.php b/src/Illuminate/Database/Migrations/Migrator.php
@@ -361,6 +361,7 @@ protected function runMigration($migration, $method)
         };
 
         $this->getSchemaGrammar($connection)->supportsSchemaTransactions()
+            && $migration->withinTransaction
                     ? $connection->transaction($callback)
                     : $callback();
     }