Support MySQL savepoint rollback variants

Author: adamziel

packages/mysql-on-sqlite/src/postgresql/class-wp-postgresql-driver.php

@@ -2583,11 +2583,7 @@ private function get_mysql_savepoint_query( string $query ): ?string {
 		if ( WP_MySQL_Lexer::ROLLBACK_SYMBOL === $tokens[0]->id ) {
 			$position = 1;
 			if ( isset( $tokens[ $position ] ) && WP_MySQL_Lexer::WORK_SYMBOL === $tokens[ $position ]->id ) {
-				if ( isset( $tokens[ $position + 1 ] ) && WP_MySQL_Lexer::TO_SYMBOL === $tokens[ $position + 1 ]->id ) {
-					throw new InvalidArgumentException( 'Unsupported SAVEPOINT statement.' );
-				}
-
-				return null;
+				++$position;
 			}
 
 			if ( isset( $tokens[ $position ] ) && WP_MySQL_Lexer::SAVEPOINT_SYMBOL === $tokens[ $position ]->id ) {

packages/mysql-on-sqlite/tests/WP_PostgreSQL_Driver_Tests.php

@@ -19309,6 +19309,18 @@ public function test_mysql_savepoint_statements_use_public_query_path(): void {
 		$this->assertSame( array(), $driver->get_last_column_meta() );
 		$this->assertSame( 'ROLLBACK TO SAVEPOINT "s1"', $this->get_last_single_postgresql_sql( $driver ) );
 
+		$this->assertSame( 0, $driver->query( 'SAVEPOINT s2' ) );
+		$driver->query( 'INSERT INTO savepoint_public VALUES (2)' );
+		$this->assertSame( 0, $driver->query( 'ROLLBACK WORK TO s2' ) );
+		$this->assertSame( 'ROLLBACK TO SAVEPOINT "s2"', $this->get_last_single_postgresql_sql( $driver ) );
+		$this->assertSame( 0, $driver->query( 'RELEASE SAVEPOINT s2' ) );
+
+		$this->assertSame( 0, $driver->query( 'SAVEPOINT s3' ) );
+		$driver->query( 'INSERT INTO savepoint_public VALUES (3)' );
+		$this->assertSame( 0, $driver->query( 'ROLLBACK WORK TO SAVEPOINT s3' ) );
+		$this->assertSame( 'ROLLBACK TO SAVEPOINT "s3"', $this->get_last_single_postgresql_sql( $driver ) );
+		$this->assertSame( 0, $driver->query( 'RELEASE SAVEPOINT s3' ) );
+
 		$this->assertSame( 0, $driver->query( 'RELEASE SAVEPOINT s1' ) );
 		$this->assertSame( 0, $driver->get_last_column_count() );
 		$this->assertSame( array(), $driver->get_last_column_meta() );
@@ -19325,8 +19337,7 @@ public function test_mysql_savepoint_statements_use_public_query_path(): void {
 	public function test_unsupported_mysql_savepoint_statements_fail_closed_without_backend_execution(): void {
 		$cases = array(
 			'RELEASE s',
-			'ROLLBACK WORK TO SAVEPOINT s',
-			'ROLLBACK WORK TO s',
+			'ROLLBACK SAVEPOINT s',
 		);
 
 		foreach ( $cases as $query ) {