Skip to content
Open
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions src/Context/FeatureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,8 @@ public function __construct() {
if ( getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
$this->variables['DB_TYPE'] = getenv( 'WP_CLI_TEST_DBTYPE' );
} else {
$this->variables['DB_TYPE'] = 'mysql';
// Auto-detect database type if not explicitly set
$this->variables['DB_TYPE'] = Utils\get_db_type();
}

if ( getenv( 'MYSQL_TCP_PORT' ) ) {
Expand Down Expand Up @@ -1202,8 +1203,9 @@ public function create_db(): void {
return;
}

$dbname = self::$db_settings['dbname'];
self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
$dbname = self::$db_settings['dbname'];
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
}

/**
Expand All @@ -1214,8 +1216,9 @@ public function test_connection(): void {
return;
}

$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
$sql_result = self::run_sql(
self::$mysql_binary . ' --no-defaults',
self::$mysql_binary . ' --no-defaults' . $ssl_flag,
[
'execute' => 'SELECT 1',
'send_to_shell' => false,
Expand All @@ -1241,8 +1244,9 @@ public function drop_db(): void {
if ( 'sqlite' === self::$db_type ) {
return;
}
$dbname = self::$db_settings['dbname'];
self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
$dbname = self::$db_settings['dbname'];
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
}

/**
Expand Down Expand Up @@ -1479,7 +1483,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
if ( 'sqlite' === self::$db_type ) {
copy( "{$install_cache_path}.sqlite", "$run_dir/wp-content/database/.ht.sqlite" );
} else {
self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
}
} else {
$this->proc( 'wp core install', $install_args, $subdir )->run_check();
Expand All @@ -1492,7 +1497,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
$mysqldump_binary = Utils\get_sql_dump_command();
$mysqldump_binary = Utils\force_env_on_nix_systems( $mysqldump_binary );
$support_column_statistics = exec( "{$mysqldump_binary} --help | grep 'column-statistics'" );
$command = "{$mysqldump_binary} --no-defaults --no-tablespaces";
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
$command = "{$mysqldump_binary} --no-defaults{$ssl_flag} --no-tablespaces";
if ( $support_column_statistics ) {
$command .= ' --skip-column-statistics';
}
Expand Down
Loading