Feedback updates

Author: karthick-murugan

features/db.feature

@@ -327,16 +327,20 @@ Feature: Perform database operations
       latin1_spanish_ci
       """
 
-  Scenario: Running an UPDATE query should return the number of affected rows
+  Scenario: Row modifying queries should return the number of affected rows
     Given a WP install
     When I run `wp db query "UPDATE wp_users SET user_status = 1 WHERE ID = 1"`
     Then STDOUT should contain:
       """
       Query succeeded. Rows affected: 1
       """
+    
+    When I run `wp db query "SELECT * FROM wp_users WHERE ID = 1"`
+    Then STDOUT should not contain:
+      """
+      Rows affected
+      """
 
-  Scenario: Running an DELETE query should return the number of affected rows
-    Given a WP install
     When I run `wp db query "DELETE FROM wp_users WHERE ID = 1"`
     Then STDOUT should contain:
       """

src/DB_Command.php

@@ -495,22 +495,25 @@ public function cli( $_, $assoc_args ) {
 	 *     +---------+-----------------------+
 	 */
 	public function query( $args, $assoc_args ) {
+		
 		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
+
 		$assoc_args['database'] = DB_NAME;
 
+		// The query might come from STDIN.
 		if ( ! empty( $args ) ) {
 			$assoc_args['execute'] = $args[0];
 		}
 
 		if ( isset( $assoc_args['execute'] ) ) {
+			// Ensure that the SQL mode is compatible with WPDB.
 			$assoc_args['execute'] = $this->get_sql_mode_query( $assoc_args ) . $assoc_args['execute'];
 		}
 
-		$is_update_or_delete = isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE|INSERT)\b/i', $assoc_args['execute'] );
+		$is_row_modifying_query = isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE|INSERT|REPLACE|LOAD DATA)\b/i', $assoc_args['execute'] );
 
-		if ( $is_update_or_delete ) {
-			// Append `SELECT ROW_COUNT()` to the query.
+		if ( $is_row_modifying_query ) {
 			$assoc_args['execute'] .= '; SELECT ROW_COUNT();';
 		}
 
@@ -521,8 +524,7 @@ public function query( $args, $assoc_args ) {
 			WP_CLI::error( "Query failed: {$stderr}" );
 		}
 
-		// For UPDATE/DELETE queries, parse the output to get the number of rows affected.
-		if ( $is_update_or_delete ) {
+		if ( $is_row_modifying_query ) {
 			$output_lines  = explode( "\n", trim( $stdout ) );
 			$affected_rows = (int) trim( end( $output_lines ) );
 			WP_CLI::success( "Query succeeded. Rows affected: {$affected_rows}" );