Merge pull request #134 from thrijith/feature/GH-129

Fix `--all-tables` and `--all-tables-with-prefix` output when combined `--size_format`

Author: schlessera

features/db-size.feature

@@ -152,3 +152,28 @@ Feature: Display database size
       """
 
     But STDOUT should not be a number
+
+  Scenario: Display all table sizes for a WordPress install
+    Given a WP install
+
+    When I run `wp db size --all-tables --size_format=kb`
+    Then STDOUT should contain:
+      """
+      wp_posts
+      """
+
+    And STDOUT should contain:
+      """
+      KB
+      """
+
+    When I run `wp db size --all-tables-with-prefix --size_format=kb`
+    Then STDOUT should contain:
+      """
+      wp_posts
+      """
+
+    And STDOUT should contain:
+      """
+      KB
+      """

src/DB_Command.php

@@ -772,6 +772,8 @@ public function size( $args, $assoc_args ) {
 		$human_readable = WP_CLI\Utils\get_flag_value( $assoc_args, 'human-readable', false );
 		$tables = WP_CLI\Utils\get_flag_value( $assoc_args, 'tables' );
 		$tables = ! empty( $tables );
+		$all_tables = WP_CLI\Utils\get_flag_value( $assoc_args, 'all-tables' );
+		$all_tables_with_prefix = WP_CLI\Utils\get_flag_value( $assoc_args, 'all-tables-with-prefix' );
 
 		if( ! is_null( $size_format ) && $human_readable ) {
 			WP_CLI::error( "Cannot use --size_format and --human-readable arguments at the same time." );
@@ -792,7 +794,7 @@ public function size( $args, $assoc_args ) {
 
 		$default_unit = ( empty( $size_format ) && ! $human_readable ) ? ' B' : '';
 
-		if ( $tables ) {
+		if ( $tables || $all_tables || $all_tables_with_prefix ) {
 
 			// Add all of the table sizes
 			foreach( WP_CLI\Utils\wp_get_table_names( $args, $assoc_args ) as $table_name ) {
@@ -900,7 +902,7 @@ public function size( $args, $assoc_args ) {
 			}
 		}
 
-		if ( ! empty( $size_format) && ! $tables && ! $format && ! $human_readable ) {
+		if ( ! empty( $size_format) && ! $tables && ! $format && ! $human_readable && true !== $all_tables && true !== $all_tables_with_prefix ) {
 			WP_CLI::Line( filter_var( $rows[0]['Size'], FILTER_SANITIZE_NUMBER_INT ) );
 		} else {
 			// Display the rows.