forked from FriendsOfSymfony1/doctrine1
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update the export command to use a PHP8-safe PDO transaction commit path
PHP8 updated commit to throw an exception if the PDO object knows it's not in a transaction anymore while Doctrine believes that it is. Export is often running DDL commands which cause MySQL to auto-commit transactions, leading to this mismatched state. Add a helper class to support only committing if it's safe to do so
- Loading branch information
Kyle McGrogan
authored and
Kyle McGrogan
committed
Apr 25, 2024
1 parent
67f6cb6
commit 54b68d1
Showing
2 changed files
with
48 additions
and
1 deletion.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<?php | ||
|
||
/* | ||
* $Id$ | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* This software consists of voluntary contributions made by many individuals | ||
* and is licensed under the LGPL. For more information, see | ||
* <http://www.doctrine-project.org>. | ||
*/ | ||
|
||
/** | ||
* Doctrine_TransactionHelper | ||
* | ||
* @package Doctrine | ||
* @subpackage Transaction | ||
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL | ||
* @link www.doctrine-project.org | ||
* @since 1.4 | ||
* @version $Revision$ | ||
* @author Kyle McGrogan <[email protected]> | ||
*/ | ||
final class Doctrine_TransactionHelper | ||
{ | ||
public static function commitIfInTransaction(Doctrine_Connection $connection): void | ||
{ | ||
$handler = $connection->getDbh(); | ||
|
||
// Attempt to commit while no transaction is running results in exception since PHP 8 + pdo_mysql combination | ||
if ($handler instanceof PDO && !$handler->inTransaction()) { | ||
return; | ||
} | ||
|
||
$connection->commit(); | ||
} | ||
} |