Move handling of CURRENT_TIMESTAMP() with parentheses to lexer

Author: JanJakes

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

@@ -1764,6 +1764,32 @@ public function parse_keyword() {
 
 		$this->last = $i_end;
 
+		// SQLite does not support CURRENT_TIMESTAMP() function calls with parentheses,
+		// but it does support the equivalent CURRENT_TIMESTAMP variant without them.
+		// Let's remove the parentheses and surrounding spaces.
+		if ( $ret && 'CURRENT_TIMESTAMP' === $ret->value ) {
+			$end         = $this->last + 1;
+			$open_paren  = false;
+			$close_paren = false;
+			while ( static::is_whitespace( $this->str[ $end ] ) ) {
+				$end += 1;
+			}
+			if ( '(' === $this->str[ $end ] ?? '' ) {
+				$open_paren = true;
+				$end       += 1;
+			}
+			while ( static::is_whitespace( $this->str[ $end ] ) ) {
+				$end += 1;
+			}
+			if ( ')' === $this->str[ $end ] ?? '' ) {
+				$close_paren = true;
+			}
+
+			if ( $open_paren && $close_paren ) {
+				$this->last = $end;
+			}
+		}
+
 		return $ret;
 	}
 

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

@@ -772,23 +772,7 @@ public function get_return_value() {
 	 * @throws Exception If the query is not supported.
 	 */
 	private function execute_mysql_query( $query ) {
-		$tokens = ( new WP_SQLite_Lexer( $query ) )->tokens;
-
-		// SQLite does not support CURRENT_TIMESTAMP() calls with parentheses.
-		// Since CURRENT_TIMESTAMP() can appear in most types of SQL queries,
-		// let's remove the parentheses globally before further processing.
-		foreach ( $tokens as $i => $token ) {
-			if ( WP_SQLite_Token::TYPE_KEYWORD === $token->type && 'CURRENT_TIMESTAMP' === $token->keyword ) {
-				$paren_open  = $tokens[ $i + 1 ] ?? null;
-				$paren_close = $tokens[ $i + 2 ] ?? null;
-				if ( WP_SQLite_Token::TYPE_OPERATOR === $paren_open->type && '(' === $paren_open->value
-					&& WP_SQLite_Token::TYPE_OPERATOR === $paren_close->type && ')' === $paren_close->value ) {
-					unset( $tokens[ $i + 1 ], $tokens[ $i + 2 ] );
-				}
-			}
-		}
-		$tokens = array_values( $tokens );
-
+		$tokens           = ( new WP_SQLite_Lexer( $query ) )->tokens;
 		$this->rewriter   = new WP_SQLite_Query_Rewriter( $tokens );
 		$this->query_type = $this->rewriter->peek()->value;