FIX PDO in PHP 8

silverstripe · Jun 29, 2022 · da75ce6 · da75ce6
1 parent 01c27e6
commit da75ce6
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php
@@ -7,6 +7,7 @@
 use PDO;
 use PDOStatement;
 use InvalidArgumentException;
+use PDOException;
 
 /**
  * PDO driver database connector
@@ -109,10 +110,15 @@ public function getOrPrepareStatement($sql)
         }
 
         // Generate new statement
-        $statement = $this->pdoConnection->prepare(
-            $sql,
-            [PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY]
-        );
+        try {
+            $statement = $this->pdoConnection->prepare(
+                $sql,
+                [PDO::ATTR_CURSOR => PDO::CURSOR_FWDONLY]
+            );
+        } catch (PDOException $e) {
+            $statement = false;
+            $this->databaseError($e->getMessage(), E_USER_ERROR, $sql);
+        }
 
         // Wrap in a PDOStatementHandle, to cache column metadata
         $statementHandle = ($statement === false) ? false : new PDOStatementHandle($statement);
@@ -557,8 +563,11 @@ public function transactionRollback($savepoint = null)
             }
         }
 
+        // Note: $this->inTransaction may not match the 'in-transaction' state in PDO
         $this->inTransaction = false;
-        return $this->pdoConnection->rollBack();
+        if ($this->pdoConnection->inTransaction()) {
+            $this->pdoConnection->rollBack();
+        }
     }
 
     public function transactionDepth()