Robust PR 2: Support INSERT without INTO with modifier handling

Author: wp-fuse

tests/WP_SQLite_Driver_Tests.php

@@ -117,14 +117,14 @@ public function testInsertDateNow() {
 	}
 
 	public function testLockingClauses() {
-		$this->assertQuery( "SELECT * FROM _options FOR UPDATE" );
-		$this->assertQuery( "SELECT * FROM _options FOR UPDATE SKIP LOCKED" );
-		$this->assertQuery( "SELECT * FROM _options FOR UPDATE NOWAIT" );
-		$this->assertQuery( "SELECT * FROM _options LOCK IN SHARE MODE" );
+		$this->assertQuery( 'SELECT * FROM _options FOR UPDATE' );
+		$this->assertQuery( 'SELECT * FROM _options FOR UPDATE SKIP LOCKED' );
+		$this->assertQuery( 'SELECT * FROM _options FOR UPDATE NOWAIT' );
+		$this->assertQuery( 'SELECT * FROM _options LOCK IN SHARE MODE' );
 
 		// Complex queries.
-		$this->assertQuery( "SELECT * FROM _options WHERE ID IN (SELECT ID FROM _options FOR UPDATE)" );
-		$this->assertQuery( "SELECT * FROM _options UNION SELECT * FROM _options FOR UPDATE" );
+		$this->assertQuery( 'SELECT * FROM _options WHERE ID IN (SELECT ID FROM _options FOR UPDATE)' );
+		$this->assertQuery( 'SELECT * FROM _options UNION SELECT * FROM _options FOR UPDATE' );
 	}
 
 	public function testInsertWithoutInto() {
@@ -11916,4 +11916,25 @@ public function testCreateTableWithDefaultExpressions(): void {
 		$this->assertSame( "DATETIME(CURRENT_TIMESTAMP, '+' || 1 || ' YEAR')", $result[2]['dflt_value'] );
 		$this->assertSame( "('a' || 'b')", $result[3]['dflt_value'] );
 	}
+
+	public function testInsertIgnoreWithoutInto() {
+		$this->engine->query( 'CREATE TABLE test_ignore_no_into ( id INTEGER PRIMARY KEY, val TEXT )' );
+		$this->engine->query( "INSERT INTO test_ignore_no_into (id, val) VALUES (1, 'a')" );
+
+		// Test INSERT IGNORE without INTO
+		// This should be translated to "INSERT OR IGNORE INTO test_ignore_no_into ..."
+		$this->engine->query( "INSERT IGNORE test_ignore_no_into (id, val) VALUES (1, 'b')" );
+		$results = $this->engine->query( 'SELECT val FROM test_ignore_no_into WHERE id = 1' );
+		$this->assertEquals( 'a', $results[0]->val );
+	}
+
+	public function testInsertLowPriorityWithoutInto() {
+		$this->engine->query( 'CREATE TABLE test_low_priority_no_into ( id INTEGER PRIMARY KEY, val TEXT )' );
+
+		// Test INSERT LOW_PRIORITY without INTO
+		// This should be translated to "INSERT INTO test_low_priority_no_into ..." (dropping LOW_PRIORITY)
+		$this->engine->query( "INSERT LOW_PRIORITY test_low_priority_no_into (id, val) VALUES (1, 'a')" );
+		$results = $this->engine->query( 'SELECT val FROM test_low_priority_no_into WHERE id = 1' );
+		$this->assertEquals( 'a', $results[0]->val );
+	}
 }

wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php

@@ -1830,35 +1830,56 @@ private function execute_select_statement( WP_Parser_Node $node ): void {
 	private function execute_insert_or_replace_statement( WP_Parser_Node $node ): void {
 		$parts                   = array();
 		$on_conflict_update_list = null;
-		$has_into                = false;
+		$seen_into               = false;
+		$last_modifier_index     = -1;
+		$is_insert               = false;
+
 		foreach ( $node->get_children() as $child ) {
 			$is_token = $child instanceof WP_MySQL_Token;
 			$is_node  = $child instanceof WP_Parser_Node;
 
-			if ( $is_token && WP_MySQL_Lexer::INTO_SYMBOL === $child->id ) {
-				$has_into = true;
-			}
-
-			if ( $child instanceof WP_Parser_Node && 'tableRef' === $child->rule_name ) {
-				if ( ! $has_into ) {
-					$parts[]  = 'INTO';
-					$has_into = true;
-				}
+			if ( $is_node && 'tableRef' === $child->rule_name ) {
 				$database = $this->get_database_name( $child );
 				if ( 'information_schema' === strtolower( $database ) ) {
 					throw $this->new_access_denied_to_information_schema_exception();
 				}
 			}
 
+			if ( $is_node && in_array( $child->rule_name, array( 'insertLockOption', 'delayedOption' ), true ) ) {
+				// SQLite doesn't support these priority modifiers; skip them.
+				continue;
+			}
+
 			// Skip the SET keyword in "INSERT INTO ... SET ..." syntax.
 			if ( $is_token && WP_MySQL_Lexer::SET_SYMBOL === $child->id ) {
 				continue;
 			}
 
+			if ( $is_token && ( WP_MySQL_Lexer::INSERT_SYMBOL === $child->id || WP_MySQL_Lexer::REPLACE_SYMBOL === $child->id ) ) {
+				$is_insert           = WP_MySQL_Lexer::INSERT_SYMBOL === $child->id;
+				$parts[]             = $this->translate( $child );
+				$last_modifier_index = count( $parts ) - 1;
+				continue;
+			}
+
 			if ( $is_token && WP_MySQL_Lexer::IGNORE_SYMBOL === $child->id ) {
-				// Translate "UPDATE IGNORE" to "UPDATE OR IGNORE".
-				$parts[] = 'OR IGNORE';
-			} elseif (
+				// Translate MySQL "INSERT IGNORE" to SQLite "INSERT OR IGNORE".
+				$parts[]             = $is_insert ? 'OR IGNORE' : 'IGNORE';
+				$last_modifier_index = count( $parts ) - 1;
+				continue;
+			}
+
+			if ( $is_token && WP_MySQL_Lexer::INTO_SYMBOL === $child->id ) {
+				$seen_into = true;
+				$part      = $this->translate( $child );
+				if ( null !== $part ) {
+					$parts[]             = $part;
+					$last_modifier_index = count( $parts ) - 1;
+				}
+				continue;
+			}
+
+			if (
 				$is_node
 				&& (
 					'insertFromConstructor' === $child->rule_name
@@ -1887,10 +1908,17 @@ private function execute_insert_or_replace_statement( WP_Parser_Node $node ): vo
 					$parts[] = $this->translate_update_list( $table_name, $child );
 				}
 			} else {
-				$parts[] = $this->translate( $child );
+				$part = $this->translate( $child );
+				if ( null !== $part ) {
+					$parts[] = $part;
+				}
 			}
 		}
 
+		if ( ! $seen_into && -1 !== $last_modifier_index ) {
+			array_splice( $parts, $last_modifier_index + 1, 0, array( 'INTO' ) );
+		}
+
 		$query = implode( ' ', $parts );
 
 		/*