Extract debug mode setting to an option

Author: JanJakes

wp-includes/sqlite-ast/class-wp-sqlite-driver.php

@@ -232,6 +232,13 @@ class WP_SQLite_Driver {
 	 */
 	private $pdo;
 
+	/**
+	 * Enables debug mode.
+	 *
+	 * @var bool
+	 */
+	private $debug;
+
 	/**
 	 * Last executed MySQL query.
 	 *
@@ -323,6 +330,7 @@ class WP_SQLite_Driver {
 	 *                                            Must be set when PDO instance is not provided.
 	 *     @type PDO|null    $connection          Optional. PDO instance with SQLite connection.
 	 *                                            If not provided, a new PDO instance will be created.
+	 *     @type bool        $debug               Optional. Enable debug mode.
 	 *     @type int|null    $timeout             Optional. SQLite timeout in seconds.
 	 *                                            The time to wait for a writable lock.
 	 *     @type string|null $sqlite_journal_mode Optional. SQLite journal mode.
@@ -340,6 +348,9 @@ public function __construct( array $options ) {
 			$this->pdo = $options['connection'];
 		}
 
+		// Debug mode.
+		$this->debug = isset( $options['debug'] ) && true === $options['debug'];
+
 		// Create a PDO connection if it is not provided.
 		if ( ! $this->pdo ) {
 			if ( ! isset( $options['path'] ) || ! is_string( $options['path'] ) ) {
@@ -542,7 +553,7 @@ public function query( string $query, $fetch_mode = PDO::FETCH_OBJ, ...$fetch_mo
 			} catch ( Throwable $rollback_exception ) {
 				// Ignore rollback errors.
 			}
-			if ( defined( 'PDO_DEBUG' ) && PDO_DEBUG === true ) {
+			if ( true === $this->debug ) {
 				throw $e;
 			}
 			return $this->handle_error( $e );

wp-includes/sqlite/class-wp-sqlite-db.php

@@ -244,6 +244,7 @@ public function db_connect( $allow_bail = true ) {
 			$this->dbh = new WP_SQLite_Driver(
 				array(
 					'connection'          => $pdo,
+					'debug'               => defined( 'PDO_DEBUG' ) && true === PDO_DEBUG,
 					'path'                => FQDB,
 					'database'            => $this->dbname,
 					'sqlite_journal_mode' => SQLITE_JOURNAL_MODE,