Merge pull request #302 from wp-cli/copilot/fix-wp-db-optimize-repair

Add automatic --silent flag to mysqlcheck commands when --quiet is set

Author: swissspidy

features/db-check.feature

@@ -13,6 +13,25 @@ Feature: Check the database
       Success: Database checked.
       """
 
+  Scenario: db check with --quiet flag should only show errors
+    Given a WP install
+
+    When I run `wp db check --quiet`
+    Then STDOUT should be empty
+
+  Scenario: db check can explicitly pass --silent to mysqlcheck
+    Given a WP install
+
+    When I run `wp db check --silent`
+    Then STDOUT should not contain:
+      """
+      wp_cli_test.wp_users
+      """
+    And STDOUT should contain:
+      """
+      Success: Database checked.
+      """
+
   Scenario: Run db check with MySQL defaults to check the database
     Given a WP install
 

features/db.feature

@@ -185,6 +185,28 @@ Feature: Perform database operations
       """
     And STDOUT should not be empty
 
+  Scenario: db repair with --quiet flag should only show errors
+    Given a WP install
+
+    When I run `wp db repair --quiet`
+    Then STDOUT should not contain:
+      """
+      error
+      """
+
+  Scenario: db repair can explicitly pass --silent to mysqlcheck
+    Given a WP install
+
+    When I run `wp db repair --silent`
+    Then STDOUT should not contain:
+      """
+      error
+      """
+    And STDOUT should contain:
+      """
+      Success: Database repaired.
+      """
+
   Scenario: DB Query
     Given a WP install
 
@@ -334,7 +356,7 @@ Feature: Perform database operations
       """
       Query succeeded. Rows affected: 1
       """
-    
+
     When I run `wp db query "SELECT * FROM wp_users WHERE ID = 1"`
     Then STDOUT should not contain:
       """

src/DB_Command.php

@@ -260,6 +260,12 @@ public function check( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['check'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
@@ -308,6 +314,12 @@ public function optimize( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['optimize'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
@@ -356,6 +368,12 @@ public function repair( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['repair'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args