Implement and use PDOStatement fetch() and fetchAll() with basic fetch modes

JanJakes · JanJakes · commit 35234158280e · 2025-12-19T16:25:09.000+01:00
diff --git a/tests/WP_PDO_MySQL_On_SQLite_PDO_API_Tests.php b/tests/WP_PDO_MySQL_On_SQLite_PDO_API_Tests.php
@@ -86,4 +86,87 @@ public function test_rollback_no_active_transaction(): void {
 		$this->expectExceptionCode( 0 );
 		$this->driver->rollBack();
 	}
+
+	public function test_fetch_default(): void {
+		// Default fetch mode is PDO::FETCH_BOTH.
+		$result = $this->driver->query( "SELECT 1, 'abc', 2" );
+		$this->assertSame(
+			array(
+				1     => 1,
+				0     => 1,
+				'abc' => 'abc',
+				'2'   => 2,
+			),
+			$result->fetch()
+		);
+	}
+
+	/**
+	 * @dataProvider data_pdo_fetch_methods
+	 */
+	public function test_fetch( $query, $mode, $expected ): void {
+		$stmt   = $this->driver->query( $query );
+		$result = $stmt->fetch( $mode );
+		if ( is_object( $expected ) ) {
+			$this->assertInstanceOf( get_class( $expected ), $result );
+			$this->assertEquals( $expected, $result );
+		} else {
+			$this->assertSame( $expected, $result );
+		}
+	}
+
+	public function data_pdo_fetch_methods(): Generator {
+		// PDO::FETCH_BOTH
+		yield 'PDO::FETCH_BOTH' => array(
+			"SELECT 1, 'abc', 2, 'two' as `2`",
+			PDO::FETCH_BOTH,
+			array(
+				1     => 1,
+				0     => 1,
+				'abc' => 'abc',
+				'2'   => 'two',
+				'3'   => 'two',
+			),
+		);
+
+		// PDO::FETCH_NUM
+		yield 'PDO::FETCH_NUM' => array(
+			"SELECT 1, 'abc', 2, 'two' as `2`",
+			PDO::FETCH_NUM,
+			array( 1, 'abc', 2, 'two' ),
+		);
+
+		// PDO::FETCH_ASSOC
+		yield 'PDO::FETCH_ASSOC' => array(
+			"SELECT 1, 'abc', 2, 'two' as `2`",
+			PDO::FETCH_ASSOC,
+			array(
+				'1'   => 1,
+				'abc' => 'abc',
+				'2'   => 'two',
+			),
+		);
+
+		// PDO::FETCH_NAMED
+		yield 'PDO::FETCH_NAMED' => array(
+			"SELECT 1, 'abc', 2, 'two' as `2`",
+			PDO::FETCH_NAMED,
+			array(
+				'1'   => 1,
+				'abc' => 'abc',
+				'2'   => array( 2, 'two' ),
+			),
+		);
+
+		// PDO::FETCH_OBJ
+		yield 'PDO::FETCH_OBJ' => array(
+			"SELECT 1, 'abc', 2, 'two' as `2`",
+			PDO::FETCH_OBJ,
+			(object) array(
+				'1'   => 1,
+				'abc' => 'abc',
+				'2'   => 'two',
+			),
+		);
+	}
 }
diff --git a/wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php b/wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php
@@ -727,7 +727,7 @@ function ( string $sql, array $params ) {
 	#[ReturnTypeWillChange]
 	public function query( string $query, ?int $fetch_mode = PDO::FETCH_COLUMN, ...$fetch_mode_args ) {
 		$this->flush();
-		$this->pdo_fetch_mode   = $fetch_mode;
+		$this->pdo_fetch_mode   = PDO::FETCH_NUM; // TODO
 		$this->last_mysql_query = $query;
 
 		try {
@@ -772,8 +772,10 @@ public function query( string $query, ?int $fetch_mode = PDO::FETCH_COLUMN, ...$
 				$this->commit_wrapper_transaction();
 			}
 
+			$columns       = is_array( $this->last_column_meta ) ? $this->last_column_meta : array();
+			$rows          = is_array( $this->last_result ) ? $this->last_result : array();
 			$affected_rows = is_int( $this->last_return_value ) ? $this->last_return_value : 0;
-			return new WP_PDO_Synthetic_Statement( $affected_rows );
+			return new WP_PDO_Synthetic_Statement( $columns, $rows, $affected_rows );
 		} catch ( Throwable $e ) {
 			try {
 				$this->rollback_user_transaction();
@@ -2444,7 +2446,7 @@ private function execute_show_statement( WP_Parser_Node $node ): void {
 					} else {
 						$this->set_results_from_fetched_data(
 							array(
-								(object) array(
+								array(
 									'Table'        => $table_name,
 									'Create Table' => $sql,
 								),
@@ -2483,7 +2485,7 @@ private function execute_show_statement( WP_Parser_Node $node ): void {
 			case WP_MySQL_Lexer::GRANTS_SYMBOL:
 				$this->set_results_from_fetched_data(
 					array(
-						(object) array(
+						array(
 							'Grants for root@%' => 'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, CREATE ROLE, DROP ROLE ON *.* TO `root`@`localhost` WITH GRANT OPTION',
 						),
 					)
@@ -2572,7 +2574,7 @@ private function execute_show_collation_statement( WP_Parser_Node $node ): void
 			)
 		);
 		$this->store_last_column_meta_from_statement( $stmt );
-		$this->set_results_from_fetched_data( $stmt->fetchAll( PDO::FETCH_OBJ ) );
+		$this->set_results_from_fetched_data( $stmt->fetchAll( $this->pdo_fetch_mode ) );
 	}
 
 	/**
@@ -2604,7 +2606,7 @@ private function execute_show_databases_statement( WP_Parser_Node $node ): void
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$databases = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$databases = $stmt->fetchAll( $this->pdo_fetch_mode );
 		$this->set_results_from_fetched_data( $databases );
 	}
 
@@ -2690,7 +2692,7 @@ private function execute_show_index_statement( WP_Parser_Node $node ): void {
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$index_info = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$index_info = $stmt->fetchAll( $this->pdo_fetch_mode );
 		$this->set_results_from_fetched_data( $index_info );
 	}
 
@@ -2753,7 +2755,7 @@ private function execute_show_table_status_statement( WP_Parser_Node $node ): vo
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$table_info = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$table_info = $stmt->fetchAll( $this->pdo_fetch_mode );
 		if ( false === $table_info ) {
 			$this->set_results_from_fetched_data( array() );
 		}
@@ -2805,7 +2807,7 @@ private function execute_show_tables_statement( WP_Parser_Node $node ): void {
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$table_info = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$table_info = $stmt->fetchAll( $this->pdo_fetch_mode );
 		if ( false === $table_info ) {
 			$this->set_results_from_fetched_data( array() );
 		}
@@ -2878,7 +2880,7 @@ private function execute_show_columns_statement( WP_Parser_Node $node ): void {
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$column_info = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$column_info = $stmt->fetchAll( $this->pdo_fetch_mode );
 		if ( false === $column_info ) {
 			$this->set_results_from_fetched_data( array() );
 		}
@@ -2917,7 +2919,7 @@ private function execute_describe_statement( WP_Parser_Node $node ): void {
 		);
 
 		$this->store_last_column_meta_from_statement( $stmt );
-		$column_info = $stmt->fetchAll( PDO::FETCH_OBJ );
+		$column_info = $stmt->fetchAll( $this->pdo_fetch_mode );
 		$this->set_results_from_fetched_data( $column_info );
 	}
 
@@ -3239,14 +3241,14 @@ private function execute_administration_statement( WP_Parser_Node $node ): void
 
 			$operation = strtolower( $first_token->get_value() );
 			foreach ( $errors as $error ) {
-				$results[] = (object) array(
+				$results[] = array(
 					'Table'    => $this->db_name . '.' . $table_name,
 					'Op'       => $operation,
 					'Msg_type' => 'Error',
 					'Msg_text' => $error,
 				);
 			}
-			$results[] = (object) array(
+			$results[] = array(
 				'Table'    => $this->db_name . '.' . $table_name,
 				'Op'       => $operation,
 				'Msg_type' => 'status',
diff --git a/wp-includes/sqlite-ast/class-wp-pdo-synthetic-statement.php b/wp-includes/sqlite-ast/class-wp-pdo-synthetic-statement.php
@@ -79,6 +79,14 @@ public function fetchAll( $mode = PDO::FETCH_DEFAULT, ...$args ): array {
 	}
 }
 
+/**
+ * Polyfill ValueError for PHP < 8.0.
+ */
+if ( PHP_VERSION_ID < 80000 && ! class_exists( ValueError::class ) ) {
+	class ValueError extends Error {
+	}
+}
+
 /**
  * PDOStatement implementation that operates on in-memory data.
  *
@@ -88,21 +96,64 @@ public function fetchAll( $mode = PDO::FETCH_DEFAULT, ...$args ): array {
 class WP_PDO_Synthetic_Statement extends PDOStatement {
 	use WP_PDO_Synthetic_Statement_PHP_Compat;
 
+	/**
+	 * Basic column metadata (containing at least name, table name, and native type).
+	 *
+	 * @var array
+	 */
+	private $columns;
+
+	/**
+	 * Rows of the result set.
+	 *
+	 * @var array<array<mixed>>
+	 */
+	private $rows;
+
 	/**
 	 * The number of affected rows.
 	 *
 	 * @var int
 	 */
 	private $affected_rows;
 
+	/**
+	 * The current cursor offset.
+	 *
+	 * @var int
+	 */
+	private $cursor_offset = 0;
+
+	/**
+	 * The current fetch mode.
+	 *
+	 * TODO: Inherit this from "PDO::ATTR_DEFAULT_FETCH_MODE".
+	 *
+	 * @var int
+	 */
+	private $fetch_mode = PDO::FETCH_BOTH;
+
+	/**
+	 * Additional arguments for the current fetch mode.
+	 *
+	 * @var array<mixed>
+	 */
+	private $fetch_mode_args = array();
+
 	/**
 	 * Constructor.
 	 *
-	 * @param int $affected_rows The number of affected rows.
+	 * @param array $columns       Basic column metadata (containing at least name, table name, and native type).
+	 * @param array $rows          Rows of the result set.
+	 * @param int   $affected_rows The number of affected rows.
 	 */
 	public function __construct(
-		int $affected_rows = 0
+		array $columns,
+		array $rows,
+		int $affected_rows
 	) {
+		$this->columns       = $columns;
+		$this->rows          = $rows;
 		$this->affected_rows = $affected_rows;
 	}
 
@@ -122,7 +173,7 @@ public function execute( $params = null ): bool {
 	 * @return int The number of columns in the result set.
 	 */
 	public function columnCount(): int {
-		throw new RuntimeException( 'Not implemented' );
+		return count( $this->columns );
 	}
 
 	/**
@@ -152,7 +203,75 @@ public function fetch(
 		$cursorOrientation = 0,
 		$cursorOffset = 0
 	) {
-		throw new RuntimeException( 'Not implemented' );
+		if ( 0 === $mode || null === $mode ) {
+			$mode = $this->fetch_mode;
+		}
+		if ( null === $cursorOrientation ) {
+			$cursorOrientation = PDO::FETCH_ORI_NEXT;
+		}
+		if ( null === $cursorOffset ) {
+			$cursorOffset = 0;
+		}
+
+		if ( ! array_key_exists( $this->cursor_offset, $this->rows ) ) {
+			return false;
+		}
+
+		// Get current row data and column names.
+		$row          = $this->rows[ $this->cursor_offset ];
+		$column_names = array_column( $this->columns, 'name' );
+
+		// Advance the cursor to the next row.
+		$this->cursor_offset += 1;
+
+		/*
+		 * TODO: Support scrollable cursor ($cursorOrientation and $cursorOffset).
+		 *       This only has works for with statements that were prepared with
+		 *       the PDO::ATTR_CURSOR attribute set to PDO::CURSOR_SCROLL value.
+		 *       Without it, these parameters have no effect.
+		 */
+
+		switch ( $mode ) {
+			case PDO::FETCH_BOTH:
+				$values = array();
+				foreach ( $row as $i => $value ) {
+					$name            = $column_names[ $i ];
+					$values[ $name ] = $value;
+					if ( ! array_key_exists( $i, $values ) ) {
+						$values[ $i ] = $value;
+					}
+				}
+				return $values;
+			case PDO::FETCH_NUM:
+				return $row;
+			case PDO::FETCH_ASSOC:
+				return array_combine( $column_names, $row );
+			case PDO::FETCH_NAMED:
+				$values = array();
+				foreach ( $row as $i => $value ) {
+					$name = $column_names[ $i ];
+					if ( is_array( $values[ $name ] ?? null ) ) {
+						$values[ $name ][] = $value;
+					} elseif ( array_key_exists( $name, $values ) ) {
+						$values[ $name ] = array( $values[ $name ], $value );
+					} else {
+						$values[ $name ] = $value;
+					}
+				}
+				return $values;
+			case PDO::FETCH_OBJ:
+				return (object) array_combine( $column_names, $row );
+			case PDO::FETCH_CLASS:
+				throw new RuntimeException( "'PDO::FETCH_CLASS' mode is not supported" );
+			case PDO::FETCH_INTO:
+				throw new RuntimeException( "'PDO::FETCH_INTO' mode is not supported" );
+			case PDO::FETCH_LAZY:
+				throw new RuntimeException( "'PDO::FETCH_LAZY' mode is not supported" );
+			case PDO::FETCH_BOUND:
+				throw new RuntimeException( "'PDO::FETCH_BOUND' mode is not supported" );
+			default:
+				throw new ValueError( sprintf( 'PDOStatement::fetch(): Argument #1 ($mode) must be a bitmask of PDO::FETCH_* constants', $mode ) );
+		}
 	}
 
 	/**
@@ -322,6 +441,14 @@ public function debugDumpParams(): ?bool {
 	 * @return array       The result set as an array of rows.
 	 */
 	private function fetchAllRows( $mode = null, ...$args ): array {
-		throw new RuntimeException( 'Not implemented' );
+		if ( null === $mode || 0 === $mode ) {
+			$mode = $this->fetch_mode;
+		}
+
+		$rows = array();
+		while ( $row = $this->fetch( $mode, ...$args ) ) {
+			$rows[] = $row;
+		}
+		return $rows;
 	}
 }
diff --git a/wp-includes/sqlite-ast/class-wp-sqlite-driver.php b/wp-includes/sqlite-ast/class-wp-sqlite-driver.php
