Merge pull request #163 from wojsmol/patch-1

Author: schlessera

features/db-size.feature

@@ -133,6 +133,31 @@ Feature: Display database size
     When I run `wp db size --size_format=TB`
     Then STDOUT should be a number
 
+  Scenario: Display only database size in megabytes with specific precision for a WordPress install
+    Given a WP install
+
+    When I run `wp db size --size_format=mb --decimals=0`
+    Then STDOUT should not contain:
+      """
+      .
+      """
+
+    And STDOUT should not contain:
+      """
+      MB
+      """
+
+    When I run `wp db size --size_format=mb --decimals=1`
+    Then STDOUT should contain:
+      """
+      .
+      """
+
+    And STDOUT should not contain:
+      """
+      MB
+      """
+
   Scenario: Display database size in bytes with specific format for a WordPress install
     Given a WP install
 

src/DB_Command.php

@@ -817,6 +817,9 @@ public function tables( $args, $assoc_args ) {
 	 * [--network]
 	 * : List all the tables in a multisite install.
 	 *
+	 * [--decimals=<decimals>]
+	 * : Number of digits after decimal point. Defaults to 0.
+	 *
 	 * [--all-tables-with-prefix]
 	 * : List all tables that match the table prefix even if not registered on $wpdb. Overrides --network.
 	 *
@@ -999,12 +1002,13 @@ public function size( $args, $assoc_args ) {
 				}
 					$size_format_display = preg_replace( '/IB$/u', 'iB', strtoupper( $size_format ) );
 
-					$rows[ $index ]['Size'] = ceil( $row['Size'] / $divisor ) . ' ' . $size_format_display;
+					$decimals               = Utils\get_flag_value( $assoc_args, 'decimals', 0 );
+					$rows[ $index ]['Size'] = round( $row['Size'] / $divisor, $decimals ) . ' ' . $size_format_display;
 			}
 		}
 
 		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 ) );
+			WP_CLI::line( str_replace( " {$size_format_display}", '', $rows[0]['Size'] ) );
 		} else {
 			// Display the rows.
 			$args = [