Return parser instance rather than a generator

Author: JanJakes

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

@@ -655,7 +655,13 @@ public function query( string $query, $fetch_mode = PDO::FETCH_OBJ, ...$fetch_mo
 
 		try {
 			// Parse the MySQL query.
-			$ast = $this->parse_query( $query )->current();
+			// TODO: Translate and execute all queries in the SQL input string.
+			$parser = $this->create_parser( $query );
+			$parser->next_query();
+			$ast = $parser->get_query_ast();
+			if ( null === $ast ) {
+				throw $this->new_driver_exception( 'Failed to parse the MySQL query.' );
+			}
 
 			// Handle transaction commands.
 
@@ -728,24 +734,15 @@ public function query( string $query, $fetch_mode = PDO::FETCH_OBJ, ...$fetch_mo
 	}
 
 	/**
-	 * Parse a MySQL query into an array of ASTs.
+	 * Tokenize a MySQL query and initialize a parser.
 	 *
-	 * @param  string           $query    The MySQL query to parse.
-	 * @return Generator<WP_Parser_Node>  A generator of ASTs representing the queries parsed from the input.
-	 * @throws WP_SQLite_Driver_Exception When the query parsing fails.
+	 * @param  string          $query The MySQL query to parse.
+	 * @return WP_MySQL_Parser        A parser initialized for the MySQL query.
 	 */
-	public function parse_query( string $query ): Generator {
+	public function create_parser( string $query ): WP_MySQL_Parser {
 		$lexer  = new WP_MySQL_Lexer( $query );
 		$tokens = $lexer->remaining_tokens();
-
-		$parser = new WP_MySQL_Parser( self::$mysql_grammar, $tokens );
-		while ( $parser->next_query() ) {
-			$ast = $parser->get_query_ast();
-			if ( null === $ast ) {
-				throw $this->new_driver_exception( 'Failed to parse the MySQL query.' );
-			}
-			yield $ast;
-		}
+		return new WP_MySQL_Parser( self::$mysql_grammar, $tokens );
 	}
 
 	/**

wp-includes/sqlite-ast/class-wp-sqlite-information-schema-reconstructor.php

@@ -64,8 +64,14 @@ public function ensure_correct_information_schema(): void {
 				throw new Exception( 'The "wp_get_db_schema()" function was not defined.' );
 			}
 			$schema = wp_get_db_schema();
-			foreach ( $this->driver->parse_query( $schema ) as $query ) {
-				$create_node = $query->get_first_descendant_node( 'createStatement' );
+			$parser = $this->driver->create_parser( $schema );
+			while ( $parser->next_query() ) {
+				$ast = $parser->get_query_ast();
+				if ( null === $ast ) {
+					throw new WP_SQLite_Driver_Exception( $this->driver, 'Failed to parse the MySQL query.' );
+				}
+
+				$create_node = $ast->get_first_descendant_node( 'createStatement' );
 				if ( $create_node && $create_node->has_child_node( 'createTable' ) ) {
 					$name_node = $create_node->get_first_descendant_node( 'tableName' );
 					$name      = $this->unquote_mysql_identifier(
@@ -86,7 +92,10 @@ public function ensure_correct_information_schema(): void {
 				} else {
 					// Other table (a WordPress plugin or unrelated to WordPress).
 					$sql = $this->generate_create_table_statement( $table );
-					$ast = $this->driver->parse_query( $sql )->current();
+					$ast = $this->driver->create_parser( $sql )->parse();
+					if ( null === $ast ) {
+						throw new WP_SQLite_Driver_Exception( $this->driver, 'Failed to parse the MySQL query.' );
+					}
 				}
 				$this->information_schema_builder->record_create_table( $ast );
 			}
@@ -96,7 +105,10 @@ public function ensure_correct_information_schema(): void {
 		foreach ( $information_schema_tables as $table ) {
 			if ( ! in_array( $table, $tables, true ) ) {
 				$sql = sprintf( 'DROP %s', $this->quote_sqlite_identifier( $table ) );
-				$ast = $this->driver->parse_query( $sql )->current();
+				$ast = $this->driver->create_parser( $sql )->parse();
+				if ( null === $ast ) {
+					throw new WP_SQLite_Driver_Exception( $this->driver, 'Failed to parse the MySQL query.' );
+				}
 				$this->information_schema_builder->record_drop_table( $ast );
 			}
 		}