Сheck for active transaction in commit and rollback methods

spiral-modules · Mar 18, 2021 · 0e163b4 · 0e163b4
2 parents 4818807 + 567cbe4
commit 0e163b4
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 8 deletions.
diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -76,7 +76,7 @@ abstract class Driver implements DriverInterface, LoggerAwareInterface
     protected $pdo;
 
     /** @var int */
-    protected $transactionLevel;
+    protected $transactionLevel = 0;
 
     /** @var HandlerInterface */
     protected $schemaHandler;
@@ -102,7 +102,6 @@ public function __construct(
         CompilerInterface $queryCompiler,
         BuilderInterface $queryBuilder
     ) {
-        $this->transactionLevel = 0;
         $this->schemaHandler = $schemaHandler->withDriver($this);
         $this->queryBuilder = $queryBuilder->withDriver($this);
         $this->queryCompiler = $queryCompiler;
@@ -352,7 +351,7 @@ public function lastInsertID(string $sequence = null)
      */
     public function beginTransaction(string $isolationLevel = null): bool
     {
-        $this->transactionLevel++;
+        ++$this->transactionLevel;
 
         if ($this->transactionLevel === 1) {
             if ($isolationLevel !== null) {
@@ -377,10 +376,11 @@ public function beginTransaction(string $isolationLevel = null): bool
                     try {
                         return $this->getPDO()->beginTransaction();
                     } catch (Throwable $e) {
+                        $this->transactionLevel = 0;
                         throw $this->mapException($e, 'BEGIN TRANSACTION');
                     }
                 } else {
-                    $this->transactionLevel--;
+                    $this->transactionLevel = 0;
                     throw $e;
                 }
             }
@@ -395,10 +395,31 @@ public function beginTransaction(string $isolationLevel = null): bool
      * Commit the active database transaction.
      *
      * @return bool
+     *
+     * @throws StatementException
      */
     public function commitTransaction(): bool
     {
-        $this->transactionLevel--;
+        // Check active transaction
+        if (!$this->getPDO()->inTransaction()) {
+            if ($this->logger !== null) {
+                $this->logger->warning(
+                    sprintf(
+                        'Attempt to commit a transaction that has not yet begun. Transaction level: %d',
+                        $this->transactionLevel
+                    )
+                );
+            }
+
+            if ($this->transactionLevel === 0) {
+                return false;
+            }
+
+            $this->transactionLevel = 0;
+            return true;
+        }
+
+        --$this->transactionLevel;
 
         if ($this->transactionLevel === 0) {
             if ($this->logger !== null) {
@@ -421,10 +442,27 @@ public function commitTransaction(): bool
      * Rollback the active database transaction.
      *
      * @return bool
+     *
+     * @throws StatementException
      */
     public function rollbackTransaction(): bool
     {
-        $this->transactionLevel--;
+        // Check active transaction
+        if (!$this->getPDO()->inTransaction()) {
+            if ($this->logger !== null) {
+                $this->logger->warning(
+                    sprintf(
+                        'Attempt to rollback a transaction that has not yet begun. Transaction level: %d',
+                        $this->transactionLevel
+                    )
+                );
+            }
+
+            $this->transactionLevel = 0;
+            return false;
+        }
+
+        --$this->transactionLevel;
 
         if ($this->transactionLevel === 0) {
             if ($this->logger !== null) {

diff --git a/src/Driver/Postgres/PostgresDriver.php b/src/Driver/Postgres/PostgresDriver.php
@@ -119,7 +119,7 @@ public function resetPrimaryKeys(): void
      */
     public function beginTransaction(string $isolationLevel = null): bool
     {
-        $this->transactionLevel++;
+        ++$this->transactionLevel;
 
         if ($this->transactionLevel === 1) {
             if ($this->logger !== null) {
@@ -145,10 +145,11 @@ public function beginTransaction(string $isolationLevel = null): bool
                     try {
                         return $this->getPDO()->beginTransaction();
                     } catch (Throwable $e) {
+                        $this->transactionLevel = 0;
                         throw $this->mapException($e, 'BEGIN TRANSACTION');
                     }
                 } else {
-                    $this->transactionLevel--;
+                    $this->transactionLevel = 0;
                     throw $e;
                 }
             }