Add fix

Author: schlessera

features/search-replace.feature

@@ -1151,7 +1151,7 @@ Feature: Do global search/replace
       echo "CREATE TABLE \`wp_123_test\` (\`key\` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, \`text\` TEXT, PRIMARY KEY (\`key\`) );" > test_db.sql
       echo "INSERT INTO \`wp_123_test\` (\`text\`) VALUES" >> test_db.sql
       index=1
-      while [[ $index -le 999 ]];
+      while [[ $index -le 199 ]];
       do
         echo "('abc'),('abc'),('abc'),('abc'),('abc'),('abc'),('abc'),('abc'),('abc'),('abc')," >> test_db.sql
         index=`expr $index + 1`
@@ -1164,13 +1164,13 @@ Feature: Do global search/replace
     When I run `wp search-replace --dry-run 'abc' 'def' --all-tables-with-prefix --skip-columns=guid,domain --precise`
     Then STDOUT should contain:
       """
-      Success: 10000 replacements to be made.
+      Success: 2000 replacements to be made.
       """
 
     When I run `wp search-replace 'abc' 'def' --all-tables-with-prefix --skip-columns=guid,domain --precise`
     Then STDOUT should contain:
       """
-      Success: Made 10000 replacements.
+      Success: Made 2000 replacements.
       """
 
     When I run `wp search-replace --dry-run 'abc' 'def' --all-tables-with-prefix --skip-columns=guid,domain --precise`

src/Search_Replace_Command.php

@@ -552,6 +552,10 @@ static function ( $key ) {
 		$limit                = 1000;
 		$offset               = 0;
 
+		// Updates have to be deferred to after the chunking is completed, as
+		// the offset will otherwise not work correctly.
+		$updates = [];
+
 		// 2 errors:
 		// - WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- escaped through self::esc_sql_ident
 		// - WordPress.CodeAnalysis.AssignmentInCondition -- no reason to do copy-paste for a single valid assignment in while
@@ -560,7 +564,7 @@ static function ( $key ) {
 			foreach ( $rows as $keys ) {
 				$where_sql = '';
 				foreach ( (array) $keys as $k => $v ) {
-					if ( $where_sql !== '' ) {
+					if ( '' !== $where_sql ) {
 						$where_sql .= ' AND ';
 					}
 					$where_sql .= self::esc_sql_ident( $k ) . ' = ' . self::esc_sql_value( $v );
@@ -584,21 +588,24 @@ static function ( $key ) {
 					$replacer->clear_log_data();
 				}
 
-				if ( $this->dry_run ) {
-					$count++;
-				} else {
+				$count++;
+				if ( ! $this->dry_run ) {
 					$update_where = array();
 					foreach ( (array) $keys as $k => $v ) {
 						$update_where[ $k ] = $v;
 					}
 
-					$count += $wpdb->update( $table, array( $col => $value ), $update_where );
+					$updates[] = [ $table, array( $col => $value ), $update_where ];
 				}
 			}
 
 			$offset += $limit;
 		}
 
+		foreach ( $updates as $update ) {
+			$wpdb->update( ...$update );
+		}
+
 		if ( $this->verbose && 'table' === $this->format ) {
 			$time = round( microtime( true ) - $this->start_time, 3 );
 			WP_CLI::log( sprintf( '%d rows affected using PHP (in %ss).', $count, $time ) );