-
-
Notifications
You must be signed in to change notification settings - Fork 389
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/2.3.x' into 3.0.x
# Conflicts: # lib/Doctrine/Migrations/Migrator.php # lib/Doctrine/Migrations/Tracking/TableUpdater.php # lib/Doctrine/Migrations/Version/Executor.php # lib/Doctrine/Migrations/Version/Factory.php
- Loading branch information
Showing
6 changed files
with
43 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Doctrine\Migrations\Tools; | ||
|
||
use Doctrine\DBAL\Connection; | ||
use PDO; | ||
|
||
/** | ||
* @internal | ||
*/ | ||
final class TransactionHelper | ||
{ | ||
public static function commitIfInTransaction(Connection $connection): void | ||
{ | ||
$wrappedConnection = $connection->getWrappedConnection(); | ||
|
||
// Attempt to commit while no transaction is running results in exception since PHP 8 + pdo_mysql combination | ||
if ($wrappedConnection instanceof PDO && ! $wrappedConnection->inTransaction()) { | ||
return; | ||
} | ||
|
||
$connection->commit(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters