Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Improve MariaDB detection/compatibility #280

Merged
merged 9 commits into from
Mar 28, 2025
Merged

Improve MariaDB detection/compatibility #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef928ea
Don't hardcode MySQL command names, part 2
swissspidy Mar 11, 2025
1c6f7f4
Test with framework changes
swissspidy Mar 26, 2025
70fc73b
Catch another instance
swissspidy Mar 26, 2025
e4abe55
Partial revert
swissspidy Mar 27, 2025
7acbb29
Update tests
swissspidy Mar 27, 2025
bc7f749
add back usr/bin/env
swissspidy Mar 27, 2025
efa241e
another one
swissspidy Mar 27, 2025
bdc03d7
Use new util
swissspidy Mar 28, 2025
dc7431d
Undo composer.json change
swissspidy Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions features/db-import.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,22 +135,13 @@ Feature: Import a WordPress database
Then the wp_cli_test.sql file should exist

When I try `wp db import --defaults --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-auto-rehash#

When I try `wp db import --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#

When I try `wp db import --no-defaults --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#

@require-wp-4.2
Scenario: Import db that has emoji in post
Expand Down
15 changes: 3 additions & 12 deletions features/db-query.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,13 @@ Feature: Query the database with WordPress' MySQL config
Given a WP install

When I try `wp db query --defaults --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-auto-rehash#

When I try `wp db query --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#

When I try `wp db query --no-defaults --debug`
Then STDERR should contain:
"""
Debug (db): Running shell command: /usr/bin/env mysql --no-defaults --no-auto-rehash
"""
Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#

Scenario: SQL modes do not include any of the modes incompatible with WordPress
Given a WP install
Expand Down
50 changes: 28 additions & 22 deletions src/DB_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@

$command = sprintf(
'/usr/bin/env %s%s %s',
$this->get_check_command(),
Utils\get_sql_check_command(),
$this->get_defaults_flag_string( $assoc_args ),
'%s'
);
Expand Down Expand Up @@ -300,7 +300,7 @@
public function optimize( $_, $assoc_args ) {
$command = sprintf(
'/usr/bin/env %s%s %s',
$this->get_check_command(),
Utils\get_sql_check_command(),
$this->get_defaults_flag_string( $assoc_args ),
'%s'
);
Expand Down Expand Up @@ -348,7 +348,7 @@
public function repair( $_, $assoc_args ) {
$command = sprintf(
'/usr/bin/env %s%s %s',
$this->get_check_command(),
Utils\get_sql_check_command(),
$this->get_defaults_flag_string( $assoc_args ),
'%s'
);
Expand Down Expand Up @@ -397,7 +397,11 @@
*/
public function cli( $_, $assoc_args ) {

$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
$command = sprintf(
'/usr/bin/env %s%s --no-auto-rehash',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
);

Check warning on line 404 in src/DB_Command.php

View check run for this annotation

Codecov / codecov/patch

src/DB_Command.php#L400-L404 

Added lines #L400 - L404 were not covered by tests
WP_CLI::debug( "Running shell command: {$command}", 'db' );

if ( ! isset( $assoc_args['database'] ) ) {
Expand Down Expand Up @@ -496,7 +500,11 @@
*/
public function query( $args, $assoc_args ) {

$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
$command = sprintf(
'/usr/bin/env %s%s --no-auto-rehash',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
);
WP_CLI::debug( "Running shell command: {$command}", 'db' );

$assoc_args['database'] = DB_NAME;
Expand Down Expand Up @@ -642,7 +650,7 @@
$assoc_args['result-file'] = $result_file;
}

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

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

Expand Down Expand Up @@ -732,7 +740,8 @@

list( $stdout, $stderr, $exit_code ) = self::run(
sprintf(
'/usr/bin/env mysql%s --no-auto-rehash --batch --skip-column-names',
'%s%s --no-auto-rehash --batch --skip-column-names',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
),
[ 'execute' => $query ],
Expand Down Expand Up @@ -819,7 +828,11 @@
$result_file = 'STDIN';
}

$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
$command = sprintf(
'/usr/bin/env %s%s --no-auto-rehash',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
);
WP_CLI::debug( "Running shell command: {$command}", 'db' );
WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );

Expand Down Expand Up @@ -1752,7 +1765,8 @@

self::run(
sprintf(
'/usr/bin/env mysql%s --no-auto-rehash',
'%s%s --no-auto-rehash',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
),
array_merge( [ 'execute' => $query ], $mysql_args )
Expand Down Expand Up @@ -2152,7 +2166,8 @@

list( $stdout, $stderr, $exit_code ) = self::run(
sprintf(
'/usr/bin/env mysql%s --no-auto-rehash --batch --skip-column-names',
'%s%s --no-auto-rehash --batch --skip-column-names',
$this->get_mysql_command(),
$this->get_defaults_flag_string( $assoc_args )
),
array_merge( $args, [ 'execute' => 'SELECT @@SESSION.sql_mode' ] ),
Expand Down Expand Up @@ -2185,20 +2200,11 @@
}

/**
* Returns the correct `check` command based on the detected database type.
* Returns the correct `mysql` command based on the detected database type.
*
* @return string The appropriate check command.
*/
private function get_check_command() {
return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-check' : 'mysqlcheck';
}

/**
* Returns the correct `dump` command based on the detected database type.
*
* @return string The appropriate dump command.
*/
private function get_dump_command() {
return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-dump' : 'mysqldump';
private function get_mysql_command() {
return 'mariadb' === Utils\get_db_type() ? 'mariadb' : 'mysql';
}
}
Loading