Feedback changes

Author: karthick-murugan

src/DB_Command.php

@@ -507,104 +507,25 @@ public function query( $args, $assoc_args ) {
 			$assoc_args['execute'] = $this->get_sql_mode_query( $assoc_args ) . $assoc_args['execute'];
 		}
 
-		// Get the original query for tracking.
-		$original_query = isset( $assoc_args['execute'] ) ? $assoc_args['execute'] : '';
-	
-		// Check if this is a test environment.
-		$is_test_environment = $this->is_in_test_environment();
-	
-		// Only add ROW_COUNT() query for real-world UPDATE/DELETE operations.
-		$is_update_delete   = isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE)\b/i', $assoc_args['execute'] );
-		$show_affected_rows = $is_update_delete && ! $is_test_environment && ! isset( $assoc_args['skip-affected-rows'] );
-	
-		// Modify the query only when we want to show affected rows.
-		if ( $show_affected_rows ) {
-			$assoc_args['execute'] .= '; SELECT ROW_COUNT() AS affected_rows;';
+		// Check if the query is an UPDATE or DELETE.
+		if ( isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE|INSERT)\b/i', $assoc_args['execute'] ) ) {
+			// Append `SELECT ROW_COUNT()` to the query.
+			$assoc_args['execute'] .= '; SELECT ROW_COUNT();';
 		}
 
 		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
-		list($stdout, $stderr, $exit_code) = self::run( $command, $assoc_args, false );
+		list( $stdout, $stderr, $exit_code ) = self::run( $command, $assoc_args, false );
 
 		if ( $exit_code ) {
 			WP_CLI::error( "Query failed: {$stderr}" );
 		}
 
-		// For test environments, keep the output exactly as expected by tests.
-		if ( $is_test_environment ) {
-			WP_CLI::log( $stdout );
-			WP_CLI::success( 'Query executed successfully.' );
-			return;
+		// For UPDATE/DELETE queries, parse the output to get the number of rows affected.
+		if ( isset( $assoc_args['execute'] ) && preg_match( '/\b(UPDATE|DELETE|INSERT)\b/i', $assoc_args['execute'] ) ) {
+			$output_lines  = explode( "\n", trim( $stdout ) );
+			$affected_rows = (int) trim( end( $output_lines ) );
+			WP_CLI::success( "Query succeeded. Rows affected: {$affected_rows}" );
 		}
-	
-		// Process the output differently depending on whether we're showing affected rows.
-		if ( $show_affected_rows ) {
-			// Extract the affected rows count from the output.
-			$output_lines = explode( "\n", $stdout );
-	
-			// Find the line with "affected_rows" if it exists.
-			$affected_rows          = 0;
-			$row_count_header_index = -1;
-	
-			for ( $i = 0; $i < count( $output_lines ); $i++ ) {
-				if ( strpos( $output_lines[ $i ], 'affected_rows' ) !== false ) {
-					$row_count_header_index = $i;
-					// The value should be in the next line.
-					if ( isset( $output_lines[ $i + 1 ] ) ) {
-						$affected_rows = (int) trim( $output_lines[ $i + 1 ] );
-					}
-					break;
-				}
-			}
-	
-			// Remove the affected_rows part from output.
-			if ( $row_count_header_index >= 0 ) {
-				// Remove the header and the value line.
-				array_splice( $output_lines, $row_count_header_index, 2 );
-				$stdout = implode( "\n", $output_lines );
-			}
-	
-			// Show the output with affected rows info.
-			WP_CLI::log( $stdout );
-			WP_CLI::success( "Query executed successfully. Rows affected: {$affected_rows}" );
-		} else {
-			// Standard output for non-UPDATE/DELETE queries.
-			WP_CLI::log( $stdout );
-			WP_CLI::success( 'Query executed successfully.' );
-		}
-	}
-	
-	/**
-	 * Determines if we're in a test environment
-	 *
-	 * @return bool Whether we're in a test environment
-	 */
-	private function is_in_test_environment() {
-		// Check if we're running in a Behat test environment.
-	
-		// Option 1: Look for environment variables that might indicate testing.
-		if ( getenv( 'WP_CLI_TEST_MODE' ) ) {
-			return true;
-		}
-	
-		// Option 2: Check if we're in a test directory path.
-		$cwd = getcwd();
-		if ( strpos( $cwd, '/tmp/wp-cli-test-run-' ) !== false ) {
-			return true;
-		}
-	
-		// Option 3: Look for test files in backtrace.
-		$backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 10 );
-		foreach ( $backtrace as $frame ) {
-			if ( isset( $frame['file'] ) && (
-				strpos( $frame['file'], 'features/' ) !== false ||
-				strpos( $frame['file'], 'behat' ) !== false ||
-				strpos( $frame['file'], 'test' ) !== false
-			) ) {
-				return true;
-			}
-		}
-	
-		return false;
 	}
 
 	/**