fix: SQLite3 may not throw DatabaseException

Use enableExceptions(). See https://www.php.net/manual/en/sqlite3.enableexceptions.php
codeigniter4 · Jan 27, 2024 · cd5ab99 · cd5ab99
1 parent 9a31656
commit cd5ab99
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
@@ -18,6 +18,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Events\Events;
 use ErrorException;
+use Exception;
 
 /**
  * @template TConnection
@@ -125,8 +126,13 @@ public function execute(...$data)
         try {
             $exception = null;
             $result    = $this->_execute($data);
+        } catch (BadMethodCallException $exception) {
+            throw $exception;
         } catch (ArgumentCountError|ErrorException $exception) {
             $result = false;
+        } catch (Exception $exception) {
+            // SQLite3 throws `Exception`.
+            $result = false;
         }
 
         // Update our query object

diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
@@ -15,7 +15,6 @@
 
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use ErrorException;
 use Exception;
 use SQLite3;
 use SQLite3Result;
@@ -87,9 +86,13 @@ public function connect(bool $persistent = false)
                 $this->database = WRITEPATH . $this->database;
             }
 
-            return (! $this->password)
+            $sqlite = (! $this->password)
                 ? new SQLite3($this->database)
                 : new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
+
+            $sqlite->enableExceptions(true);
+
+            return $sqlite;
         } catch (Exception $e) {
             throw new DatabaseException('SQLite3 error: ' . $e->getMessage());
         }
@@ -146,7 +149,7 @@ protected function execute(string $sql)
             return $this->isWriteType($sql)
                 ? $this->connID->exec($sql)
                 : $this->connID->query($sql);
-        } catch (ErrorException $e) {
+        } catch (Exception $e) {
             log_message('error', (string) $e);
 
             if ($this->DBDebug) {