Add allowed mysql flag and behat test

Author: abhijitrakas

features/db-import.feature

@@ -44,6 +44,20 @@ Feature: Import a WordPress database
       """
     And STDOUT should be empty
 
+  Scenario: Import database with passed-in options
+    Given a WP install
+
+    Given a debug.sql file:
+      """
+      INSERT INTO `wp_options` (`option_id`, `option_name`, `option_value`, `autoload`) VALUES (999, 'testoption',  'testval',  'yes'),(999, 'testoption',  'testval',  'yes');
+      """
+
+    When I try `wp db import debug.sql --force`
+    Then STDOUT should be:
+      """
+      Success: Imported from 'debug.sql'.
+      """
+
   Scenario: Help runs properly at various points of a functional WP install
     Given an empty directory
 

src/DB_Command.php

@@ -558,7 +558,10 @@ public function import( $args, $assoc_args ) {
 			$result_file = sprintf( '%s.sql', DB_NAME );
 		}
 
-		$assoc_args['database'] = DB_NAME;
+		$mysql_args = array(
+			'database' => DB_NAME,
+		);
+		$mysql_args = array_merge( self::get_dbuser_dbpass_args( $assoc_args ), $mysql_args );
 
 		if ( '-' !== $result_file ) {
 			if ( ! is_readable( $result_file ) ) {
@@ -569,14 +572,12 @@ public function import( $args, $assoc_args ) {
 				? 'SOURCE %s;'
 				: 'SET autocommit = 0; SET unique_checks = 0; SET foreign_key_checks = 0; SOURCE %s; COMMIT;';
 
-			if ( isset( $assoc_args['skip-optimization'] ) ) {
-				unset( $assoc_args['skip-optimization'] );
-			}
-
-			$assoc_args['execute'] = sprintf( $query, $result_file );
+			$mysql_args['execute'] = sprintf( $query, $result_file );
 		}
+		// Check if any mysql option pass.
+		$mysql_args = array_merge( $mysql_args, self::get_mysql_args( $assoc_args ) );
 
-		self::run( '/usr/bin/env mysql --no-defaults --no-auto-rehash', $assoc_args );
+		self::run( '/usr/bin/env mysql --no-defaults --no-auto-rehash', $mysql_args );
 
 		WP_CLI::success( sprintf( "Imported from '%s'.", $result_file ) );
 	}
@@ -1433,4 +1434,27 @@ private function get_colors( $assoc_args, $colors ) {
 
 		return $colors;
 	}
+
+	/**
+	 * Helper to pluck `mysql` opitons from associative args array.
+	 *
+	 * @param array $assoc_args Associative args array.
+	 * @return array Array with `mysql` opitons set if in passed-in associative args array.
+	 */
+	private static function get_mysql_args( $assoc_args ) {
+
+		$allowed_mysql_option = [ 'auto-rehash', 'auto-vertical-output', 'batch', 'binary-as-hex', 'binary-mode', 'bind-address', 'character-sets-dir', 'column-names', 'column-type-info', 'comments', 'compress', 'connect-expired-password', 'connect_timeout', 'database', 'debug', 'debug-check', 'debug-info', 'default-auth', 'default-character-set', 'defaults-extra-file', 'defaults-file', 'defaults-group-suffix', 'delimiter', 'enable-cleartext-plugin', 'execute', 'force', 'get-server-public-key', 'help', 'histignore', 'host', 'html', 'ignore-spaces', 'init-command', 'line-numbers', 'local-infile', 'login-path', 'max_allowed_packet', 'max_join_size', 'named-commands', 'net_buffer_length', 'no-beep', 'one-database', 'pager', 'pipe', 'plugin-dir', 'port', 'print-defaults', 'protocol', 'quick', 'raw', 'reconnect', 'i-am-a-dummy', 'safe-updates', 'secure-auth', 'select_limit', 'server-public-key-path', 'shared-memory-base-name', 'show-warnings', 'sigint-ignore', 'silent', 'skip-auto-rehash', 'skip-column-names', 'skip-line-numbers', 'skip-named-commands', 'skip-pager', 'skip-reconnect', 'socket', 'ssl-ca', 'ssl-capath', 'ssl-cert', 'ssl-cipher', 'ssl-crl', 'ssl-crlpath', 'ssl-fips-mode', 'ssl-key', 'ssl-mode', 'syslog', 'table', 'tee', 'tls-version', 'unbuffered', 'verbose', 'version', 'vertical', 'wait', 'xml' ];
+
+		$mysql_args = array();
+
+		foreach ( $assoc_args as $mysql_option_key => $mysql_option_value ) {
+			// check flags is valid flag or not.
+			if ( in_array( $mysql_option_key,  $allowed_mysql_option, true ) && ! empty( $mysql_option_value ) ) {
+				$mysql_args[$mysql_option_key] = $mysql_option_value;
+
+			}
+		}
+
+		return $mysql_args;
+	}
 }