[10.x] Add error handling and ensure re-enabling of foreign key const…

…raints (#47182) * Add error handling and ensure re-enabling of foreign key constraints * Return the result directly from the try block --------- Co-authored-by: Volodya Khurshudyan <[email protected]>
laravel · May 23, 2023 · 63ce1c0 · 63ce1c0
1 parent d90054e
commit 63ce1c0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
@@ -421,11 +421,11 @@ public function withoutForeignKeyConstraints(Closure $callback)
     {
         $this->disableForeignKeyConstraints();
 
-        $result = $callback();
-
-        $this->enableForeignKeyConstraints();
-
-        return $result;
+        try {
+            return $callback();
+        } finally {
+            $this->enableForeignKeyConstraints();
+        }
     }
 
     /**