Rename and reorder the columns

2ndkauboy · 2ndkauboy · commit 531b897b9e87 · 2024-04-26T18:01:40.000+02:00
diff --git a/features/db-search.feature b/features/db-search.feature
@@ -1073,8 +1073,8 @@ Feature: Search through the database
     When I run `wp db search example.com --format=csv`
     Then STDOUT should contain:
       """
-      wp_options,option_value,option_id,14,mail.example.com
-      wp_options,option_value,option_id,15,login@example.com
+      wp_options,option_value,mail.example.com,option_id,14
+      wp_options,option_value,login@example.com,option_id,15
       """
 
     When I try `wp db search example.com --format=ids`
diff --git a/src/DB_Command.php b/src/DB_Command.php
@@ -1484,12 +1484,16 @@ public function search( $args, $assoc_args ) {
 
 							if ( $format ) {
 								$search_results[] = [
-									'table'  => $table,
-									'column' => $column,
-									'key'    => $primary_key,
-									'value'  => $result->$primary_key,
+									'table'             => $table,
+									'column'            => $column,
 									// Remove the colors for the format output.
-									'match'  => str_replace( [ $colors['match'][0], $colors['match'][1] ], [ '', '' ], $col_val ),
+									'match'             => str_replace(
+										[ $colors['match'][0], $colors['match'][1] ],
+										[ '','' ],
+										$col_val
+									),
+									'primary_key_name'  => $primary_key,
+									'primary_key_value' => $result->$primary_key,
 								];
 							} else {
 								WP_CLI::log( $matches_only ? $col_val : ( $one_line ? "{$table_column_val}:{$pk_val}{$col_val}" : "{$pk_val}{$col_val}" ) );
@@ -1504,7 +1508,7 @@ public function search( $args, $assoc_args ) {
 			$formatter_args   = [
 				'format' => $format,
 			];
-			$formatter_fields = [ 'table', 'column', 'key', 'value', 'match' ];
+			$formatter_fields = [ 'table', 'column', 'match', 'primary_key_name', 'primary_key_value' ];
 
 			if ( $fields ) {
 				$fields           = explode( ',', $assoc_args['fields'] );
@@ -1515,7 +1519,7 @@ public function search( $args, $assoc_args ) {
 				if ( count( $tables ) > 1 ) {
 					WP_CLI::error( 'The "ids" format can only be used for a single table.' );
 				}
-				$search_results = array_column( $search_results, 'value' );
+				$search_results = array_column( $search_results, 'primary_key_value' );
 			}
 
 			$formatter = new Formatter( $formatter_args, $formatter_fields );
