Directly use Utils\get_mysql_binary_path() as-is

Author: swissspidy

src/DB_Command.php

@@ -472,8 +472,8 @@ public function cli( $_, $assoc_args ) {
 		}
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -593,8 +593,8 @@ public function query( $args, $assoc_args ) {
 		}
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -837,7 +837,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',
-				$this->get_mysql_command(),
+				Utils\get_mysql_binary_path(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			[ 'execute' => $query ],
@@ -945,8 +945,8 @@ public function import( $args, $assoc_args ) {
 		}
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -1939,7 +1939,7 @@ protected function run_query( $query, $assoc_args = [] ) {
 		self::run(
 			sprintf(
 				'%s%s --no-auto-rehash',
-				$this->get_mysql_command(),
+				Utils\get_mysql_binary_path(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			array_merge( [ 'execute' => $query ], $mysql_args )
@@ -2337,7 +2337,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',
-					$this->get_mysql_command(),
+					Utils\get_mysql_binary_path(),
 					$this->get_defaults_flag_string( $assoc_args )
 				),
 				array_merge( $args, [ 'execute' => 'SELECT @@SESSION.sql_mode' ] ),
@@ -2365,17 +2365,4 @@ protected function get_current_sql_modes( $assoc_args ) {
 
 		return $modes;
 	}
-
-	/**
-	 * Returns the correct `mysql` command based on the detected database type.
-	 *
-	 * Delegates to get_mysql_binary_path() which already probes for the MariaDB
-	 * binary and falls back to MySQL when not available.
-	 *
-	 * @return string The appropriate mysql command.
-	 */
-	private function get_mysql_command() {
-		$path = Utils\get_mysql_binary_path();
-		return '' !== $path ? basename( $path ) : 'mysql';
-	}
 }