Merge pull request wp-cli#295 from wp-cli/fix-290

Author: swissspidy

src/DB_Command.php

@@ -526,18 +526,17 @@ public function query( $args, $assoc_args ) {
 		}
 
 		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
-		list( $stdout, $stderr, $exit_code ) = self::run( $command, $assoc_args, false );
-
-		if ( $exit_code ) {
-			WP_CLI::error( "Query failed: {$stderr}" );
-		}
 
 		if ( $is_row_modifying_query ) {
-			$output_lines  = explode( "\n", trim( $stdout ) );
-			$affected_rows = (int) trim( end( $output_lines ) );
+			list( $stdout, $stderr, $exit_code ) = self::run( $command, $assoc_args, false );
+			$output_lines                        = explode( "\n", trim( $stdout ) );
+			$affected_rows                       = (int) trim( end( $output_lines ) );
+			if ( $exit_code ) {
+				WP_CLI::error( "Query failed: {$stderr}" );
+			}
 			WP_CLI::success( "Query succeeded. Rows affected: {$affected_rows}" );
-		} elseif ( ! empty( $stdout ) ) {
-			WP_CLI::line( $stdout );
+		} else {
+			self::run( $command, $assoc_args );
 		}
 	}