Reintroduce WP_SQLite_Driver as a temporary proxy exposing legacy API

JanJakes · JanJakes · commit 16ec02781b26 · 2025-12-18T16:15:24.000+01:00
diff --git a/tests/WP_SQLite_Information_Schema_Reconstructor_Tests.php b/tests/WP_SQLite_Information_Schema_Reconstructor_Tests.php
@@ -49,7 +49,7 @@ public function setUp(): void {
 		);
 
 		$builder = new WP_SQLite_Information_Schema_Builder(
-			WP_SQLite_Driver::RESERVED_PREFIX,
+			WP_PDO_MySQL_On_SQLite::RESERVED_PREFIX,
 			$this->engine->get_connection()
 		);
 
diff --git a/wp-includes/sqlite-ast/class-wp-sqlite-configurator.php b/wp-includes/sqlite-ast/class-wp-sqlite-configurator.php
@@ -14,7 +14,7 @@ class WP_SQLite_Configurator {
 	/**
 	 * The SQLite driver instance.
 	 *
-	 * @var WP_SQLite_Driver
+	 * @var WP_PDO_MySQL_On_SQLite
 	 */
 	private $driver;
 
@@ -35,11 +35,11 @@ class WP_SQLite_Configurator {
 	/**
 	 * Constructor.
 	 *
-	 * @param WP_SQLite_Driver                     $driver         The SQLite driver instance.
+	 * @param WP_PDO_MySQL_On_SQLite               $driver         The SQLite driver instance.
 	 * @param WP_SQLite_Information_Schema_Builder $schema_builder The information schema builder instance.
 	 */
 	public function __construct(
-		WP_SQLite_Driver $driver,
+		WP_PDO_MySQL_On_SQLite $driver,
 		WP_SQLite_Information_Schema_Builder $schema_builder
 	) {
 		$this->driver               = $driver;
@@ -100,7 +100,7 @@ private function ensure_global_variables_table(): void {
 			sprintf(
 				'CREATE TABLE IF NOT EXISTS %s (name TEXT PRIMARY KEY, value TEXT)',
 				$this->driver->get_connection()->quote_identifier(
-					WP_SQLite_Driver::GLOBAL_VARIABLES_TABLE_NAME
+					WP_PDO_MySQL_On_SQLite::GLOBAL_VARIABLES_TABLE_NAME
 				)
 			)
 		);
@@ -260,11 +260,11 @@ private function save_current_driver_version(): void {
 			sprintf(
 				'INSERT INTO %s (name, value) VALUES (?, ?) ON CONFLICT(name) DO UPDATE SET value = ?',
 				$this->driver->get_connection()->quote_identifier(
-					WP_SQLite_Driver::GLOBAL_VARIABLES_TABLE_NAME
+					WP_PDO_MySQL_On_SQLite::GLOBAL_VARIABLES_TABLE_NAME
 				)
 			),
 			array(
-				WP_SQLite_Driver::DRIVER_VERSION_VARIABLE_NAME,
+				WP_PDO_MySQL_On_SQLite::DRIVER_VERSION_VARIABLE_NAME,
 				SQLITE_DRIVER_VERSION,
 				SQLITE_DRIVER_VERSION,
 			)
diff --git a/wp-includes/sqlite-ast/class-wp-sqlite-driver-exception.php b/wp-includes/sqlite-ast/class-wp-sqlite-driver-exception.php
@@ -4,20 +4,20 @@ class WP_SQLite_Driver_Exception extends PDOException {
 	/**
 	 * The SQLite driver that originated the exception.
 	 *
-	 * @var WP_SQLite_Driver
+	 * @var WP_PDO_MySQL_On_SQLite
 	 */
 	private $driver;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param WP_SQLite_Driver $driver   The SQLite driver that originated the exception.
-	 * @param string           $message  The exception message.
-	 * @param int|string       $code     The exception code. In PDO, it can be a string with value of SQLSTATE.
-	 * @param Throwable|null   $previous The previous throwable used for the exception chaining.
+	 * @param WP_PDO_MySQL_On_SQLite $driver The SQLite driver that originated the exception.
+	 * @param string                 $message  The exception message.
+	 * @param int|string             $code     The exception code. In PDO, it can be a string with value of SQLSTATE.
+	 * @param Throwable|null         $previous The previous throwable used for the exception chaining.
 	 */
 	public function __construct(
-		WP_SQLite_Driver $driver,
+		WP_PDO_MySQL_On_SQLite $driver,
 		string $message,
 		$code = 0,
 		?Throwable $previous = null
@@ -27,7 +27,7 @@ public function __construct(
 		$this->driver = $driver;
 	}
 
-	public function getDriver(): WP_SQLite_Driver {
+	public function getDriver(): WP_PDO_MySQL_On_SQLite {
 		return $this->driver;
 	}
 }
diff --git a/wp-includes/sqlite-ast/class-wp-sqlite-driver.php b/wp-includes/sqlite-ast/class-wp-sqlite-driver.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * The SQLite driver uses PDO. Enable PDO function calls:
+ * phpcs:disable WordPress.DB.RestrictedClasses.mysql__PDO
+ */
+
+/**
+ * For back compatibility with dependencies that use their own loader scripts
+ * (e.g., WP CLI SQLite Command), ensure the new PDO-based classes are loaded.
+ */
+require_once __DIR__ . '/class-wp-pdo-mysql-on-sqlite.php';
+
+/**
+ * Deprecated: A proxy of the WP_PDO_MySQL_On_SQLite class preserving legacy API.
+ *
+ * This is a temporary class to preserve the legacy API for easier transition
+ * to the new PDO-based API, developed in the "WP_PDO_MySQL_On_SQLite" class.
+ */
+class WP_SQLite_Driver {
+	/** @var string */
+	public $client_info;
+
+	/** @var WP_PDO_MySQL_On_SQLite */
+	private $mysql_on_sqlite_driver;
+
+	public function __construct(
+		WP_SQLite_Connection $connection,
+		string $database,
+		int $mysql_version = 80038
+	) {
+		$this->mysql_on_sqlite_driver = new WP_PDO_MySQL_On_SQLite( $connection, $database, $mysql_version );
+		$this->main_db_name           = $database;
+		$this->client_info            = $this->mysql_on_sqlite_driver->client_info;
+	}
+
+	public function get_connection(): WP_SQLite_Connection {
+		return $this->mysql_on_sqlite_driver->get_connection();
+	}
+
+	public function get_sqlite_version(): string {
+		return $this->mysql_on_sqlite_driver->get_sqlite_version();
+	}
+
+	public function get_saved_driver_version(): string {
+		return $this->mysql_on_sqlite_driver->get_saved_driver_version();
+	}
+
+	public function is_sql_mode_active( string $mode ): bool {
+		return $this->mysql_on_sqlite_driver->is_sql_mode_active( $mode );
+	}
+
+	public function get_last_mysql_query(): ?string {
+		return $this->mysql_on_sqlite_driver->get_last_mysql_query();
+	}
+
+	public function get_last_sqlite_queries(): array {
+		return $this->mysql_on_sqlite_driver->get_last_sqlite_queries();
+	}
+
+	/** @return int|string */
+	public function get_insert_id() {
+		return $this->mysql_on_sqlite_driver->get_insert_id();
+	}
+
+	/**
+	 * @param string $query              Full SQL statement string.
+	 * @param int    $fetch_mode         PDO fetch mode. Default is PDO::FETCH_OBJ.
+	 * @param array  ...$fetch_mode_args Additional fetch mode arguments.
+	 *
+	 * @return mixed Return value, depending on the query type.
+	 *
+	 * @throws WP_SQLite_Driver_Exception When the query execution fails.
+	 */
+	public function query( string $query, $fetch_mode = PDO::FETCH_OBJ, ...$fetch_mode_args ) {
+		return $this->mysql_on_sqlite_driver->query( $query, $fetch_mode, ...$fetch_mode_args );
+	}
+
+	public function create_parser( string $query ): WP_MySQL_Parser {
+		return $this->mysql_on_sqlite_driver->create_parser( $query );
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function get_query_results() {
+		return $this->mysql_on_sqlite_driver->get_query_results();
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function get_last_return_value() {
+		return $this->mysql_on_sqlite_driver->get_last_return_value();
+	}
+
+	public function get_last_column_count(): int {
+		return $this->mysql_on_sqlite_driver->get_last_column_count();
+	}
+
+	public function get_last_column_meta(): array {
+		return $this->mysql_on_sqlite_driver->get_last_column_meta();
+	}
+
+	public function execute_sqlite_query( string $sql, array $params = array() ): PDOStatement {
+		return $this->mysql_on_sqlite_driver->execute_sqlite_query( $sql, $params );
+	}
+
+	public function begin_transaction(): void {
+		$this->mysql_on_sqlite_driver->begin_transaction();
+	}
+
+	public function commit(): void {
+		$this->mysql_on_sqlite_driver->commit();
+	}
+
+	public function rollback(): void {
+		$this->mysql_on_sqlite_driver->rollback();
+	}
+
+	/**
+	 * Proxy also the private property "$main_db_name", as it is used in tests.
+	 */
+	public function __set( string $name, $value ): void {
+		if ( 'main_db_name' === $name ) {
+			$closure = function ( string $value ) {
+				$this->main_db_name = $value;
+			};
+			$closure->call( $this->mysql_on_sqlite_driver, $value );
+		}
+	}
+
+	/**
+	 * Proxy also this private method, as it is used in tests.
+	 */
+	private function quote_mysql_utf8_string_literal( string $utf8_literal ): string {
+		$closure = function ( string $utf8_literal ) {
+			return $this->quote_mysql_utf8_string_literal( $utf8_literal );
+		};
+		return $closure->call( $this->mysql_on_sqlite_driver, $utf8_literal );
+	}
+}
diff --git a/wp-includes/sqlite-ast/class-wp-sqlite-information-schema-reconstructor.php b/wp-includes/sqlite-ast/class-wp-sqlite-information-schema-reconstructor.php
@@ -19,7 +19,7 @@ class WP_SQLite_Information_Schema_Reconstructor {
 	/**
 	 * The SQLite driver instance.
 	 *
-	 * @var WP_SQLite_Driver
+	 * @var WP_PDO_MySQL_On_SQLite
 	 */
 	private $driver;
 
@@ -40,11 +40,11 @@ class WP_SQLite_Information_Schema_Reconstructor {
 	/**
 	 * Constructor.
 	 *
-	 * @param WP_SQLite_Driver                     $driver         The SQLite driver instance.
+	 * @param WP_PDO_MySQL_On_SQLite               $driver         The SQLite driver instance.
 	 * @param WP_SQLite_Information_Schema_Builder $schema_builder The information schema builder instance.
 	 */
 	public function __construct(
-		WP_SQLite_Driver $driver,
+		$driver,
 		WP_SQLite_Information_Schema_Builder $schema_builder
 	) {
 		$this->driver         = $driver;
@@ -137,7 +137,7 @@ private function get_sqlite_table_names(): array {
 			array(
 				'_mysql_data_types_cache',
 				'sqlite\_%',
-				str_replace( '_', '\_', WP_SQLite_Driver::RESERVED_PREFIX ) . '%',
+				str_replace( '_', '\_', WP_PDO_MySQL_On_SQLite::RESERVED_PREFIX ) . '%',
 			)
 		)->fetchAll( PDO::FETCH_COLUMN );
 	}
@@ -692,9 +692,9 @@ private function get_mysql_column_type( string $column_type ): string {
 	/**
 	 * Format a MySQL UTF-8 string literal for output in a CREATE TABLE statement.
 	 *
-	 * See WP_SQLite_Driver::quote_mysql_utf8_string_literal().
+	 * See WP_PDO_MySQL_On_SQLite::quote_mysql_utf8_string_literal().
 	 *
-	 * TODO: This is a copy of WP_SQLite_Driver::quote_mysql_utf8_string_literal().
+	 * TODO: This is a copy of WP_PDO_MySQL_On_SQLite::quote_mysql_utf8_string_literal().
 	 *       We may consider extracing it to reusable MySQL helpers.
 	 *
 	 * @param  string $utf8_literal The UTF-8 string literal to escape.
diff --git a/wp-pdo-mysql-on-sqlite.php b/wp-pdo-mysql-on-sqlite.php
@@ -19,3 +19,4 @@
 require_once __DIR__ . '/wp-includes/sqlite-ast/class-wp-sqlite-information-schema-builder.php';
 require_once __DIR__ . '/wp-includes/sqlite-ast/class-wp-sqlite-information-schema-exception.php';
 require_once __DIR__ . '/wp-includes/sqlite-ast/class-wp-sqlite-information-schema-reconstructor.php';
+require_once __DIR__ . '/wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php';
