Merge pull request #267 from wp-cli/266-correct-error-message

swissspidy · web-flow · commit 6c09f324ff48 · 2024-08-13T09:31:05.000+02:00
diff --git a/features/db-search.feature b/features/db-search.feature
@@ -1102,5 +1102,13 @@ Feature: Search through the database
     And STDOUT should be empty
     And the return code should be 1
 
+    When I try `wp db search example.com --format=count`
+    Then STDERR should be:
+      """
+      Error: The "count" format can only be used for a single table.
+      """
+    And STDOUT should be empty
+    And the return code should be 1
+
     When I run `wp db search mail.example.com wp_options --format=ids`
     Then STDOUT should not be empty
diff --git a/src/DB_Command.php b/src/DB_Command.php
@@ -1553,7 +1553,7 @@ public function search( $args, $assoc_args ) {
 
 			if ( in_array( $format, [ 'ids', 'count' ], true ) ) {
 				if ( count( $tables ) > 1 ) {
-					WP_CLI::error( 'The "ids" format can only be used for a single table.' );
+					WP_CLI::error( "The \"{$format}\" format can only be used for a single table." );
 				}
 				$search_results = array_column( $search_results, 'primary_key_value' );
 			}

Original file line number	Diff line number	Diff line change
`@@ -1553,7 +1553,7 @@ public function search( $args, $assoc_args ) {`
`1553`	`1553`
`1554`	`1554`	`if ( in_array( $format, [ 'ids', 'count' ], true ) ) {`
`1555`	`1555`	`if ( count( $tables ) > 1 ) {`
`1556`		`- WP_CLI::error( 'The "ids" format can only be used for a single table.' );`
	`1556`	`+ WP_CLI::error( "The \"{$format}\" format can only be used for a single table." );`
`1557`	`1557`	`}`
`1558`	`1558`	`$search_results = array_column( $search_results, 'primary_key_value' );`
`1559`	`1559`	`}`