Skip to content

Commit bdc03d7

Browse files
committed
Use new util
1 parent efa241e commit bdc03d7

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

src/DB_Command.php

+4-22
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public function check( $_, $assoc_args ) {
252252

253253
$command = sprintf(
254254
'/usr/bin/env %s%s %s',
255-
$this->get_check_command(),
255+
Utils\get_sql_check_command(),
256256
$this->get_defaults_flag_string( $assoc_args ),
257257
'%s'
258258
);
@@ -300,7 +300,7 @@ public function check( $_, $assoc_args ) {
300300
public function optimize( $_, $assoc_args ) {
301301
$command = sprintf(
302302
'/usr/bin/env %s%s %s',
303-
$this->get_check_command(),
303+
Utils\get_sql_check_command(),
304304
$this->get_defaults_flag_string( $assoc_args ),
305305
'%s'
306306
);
@@ -348,7 +348,7 @@ public function optimize( $_, $assoc_args ) {
348348
public function repair( $_, $assoc_args ) {
349349
$command = sprintf(
350350
'/usr/bin/env %s%s %s',
351-
$this->get_check_command(),
351+
Utils\get_sql_check_command(),
352352
$this->get_defaults_flag_string( $assoc_args ),
353353
'%s'
354354
);
@@ -650,7 +650,7 @@ public function export( $args, $assoc_args ) {
650650
$assoc_args['result-file'] = $result_file;
651651
}
652652

653-
$mysqldump_binary = Utils\force_env_on_nix_systems( $this->get_dump_command() );
653+
$mysqldump_binary = Utils\force_env_on_nix_systems( Utils\get_sql_dump_command() );
654654

655655
$support_column_statistics = exec( $mysqldump_binary . ' --help | grep "column-statistics"' );
656656

@@ -2207,22 +2207,4 @@ protected function get_current_sql_modes( $assoc_args ) {
22072207
private function get_mysql_command() {
22082208
return 'mariadb' === Utils\get_db_type() ? 'mariadb' : 'mysql';
22092209
}
2210-
2211-
/**
2212-
* Returns the correct `check` command based on the detected database type.
2213-
*
2214-
* @return string The appropriate check command.
2215-
*/
2216-
private function get_check_command() {
2217-
return 'mariadb' === Utils\get_db_type() ? 'mariadb-check' : 'mysqlcheck';
2218-
}
2219-
2220-
/**
2221-
* Returns the correct `dump` command based on the detected database type.
2222-
*
2223-
* @return string The appropriate dump command.
2224-
*/
2225-
private function get_dump_command() {
2226-
return 'mariadb' === Utils\get_db_type() ? 'mariadb-dump' : 'mysqldump';
2227-
}
22282210
}

0 commit comments

Comments
 (0)