Partial revert

Author: swissspidy

src/DB_Command.php

@@ -399,7 +399,7 @@ public function cli( $_, $assoc_args ) {
 
 		$command = sprintf(
 			'%s%s --no-auto-rehash',
-			Utils\get_mysql_binary_path(),
+			$this->get_mysql_command(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -502,7 +502,7 @@ public function query( $args, $assoc_args ) {
 
 		$command = sprintf(
 			'%s%s --no-auto-rehash',
-			Utils\get_mysql_binary_path(),
+			$this->get_mysql_command(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -741,7 +741,7 @@ private function get_posts_table_charset( $assoc_args ) {
 		list( $stdout, $stderr, $exit_code ) = self::run(
 			sprintf(
 				'%s%s --no-auto-rehash --batch --skip-column-names',
-				Utils\get_mysql_binary_path(),
+				$this->get_mysql_command(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			[ 'execute' => $query ],
@@ -830,7 +830,7 @@ public function import( $args, $assoc_args ) {
 
 		$command = sprintf(
 			'%s%s --no-auto-rehash',
-			Utils\get_mysql_binary_path(),
+			$this->get_mysql_command(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -1766,7 +1766,7 @@ protected function run_query( $query, $assoc_args = [] ) {
 		self::run(
 			sprintf(
 				'%s%s --no-auto-rehash',
-				Utils\get_mysql_binary_path(),
+				$this->get_mysql_command(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			array_merge( [ 'execute' => $query ], $mysql_args )
@@ -2167,7 +2167,7 @@ protected function get_current_sql_modes( $assoc_args ) {
 			list( $stdout, $stderr, $exit_code ) = self::run(
 				sprintf(
 					'%s%s --no-auto-rehash --batch --skip-column-names',
-					Utils\get_mysql_binary_path(),
+					$this->get_mysql_command(),
 					$this->get_defaults_flag_string( $assoc_args )
 				),
 				array_merge( $args, [ 'execute' => 'SELECT @@SESSION.sql_mode' ] ),
@@ -2199,6 +2199,15 @@ protected function get_current_sql_modes( $assoc_args ) {
 		return $modes;
 	}
 
+	/**
+	 * Returns the correct `mysql` command based on the detected database type.
+	 *
+	 * @return string The appropriate check command.
+	 */
+	private function get_mysql_command() {
+		return 'mariadb' === Utils\get_db_type() ? 'mariadb' : 'mysql';
+	}
+
 	/**
 	 * Returns the correct `check` command based on the detected database type.
 	 *