Improve MariaDB detection

Author: swissspidy

bin/install-package-tests

@@ -60,19 +60,42 @@ if [ -n "${WP_CLI_TEST_DBPASS}" ]; then
   TEST_PASSWORD="${WP_CLI_TEST_DBPASS}"
 fi
 
-echo 'Checking if MySQL is ready...'
+TYPE="MySQL"
+CLIENT_VERSION=$(/usr/bin/env mysql --version 2>/dev/null)
+case "${CLIENT_VERSION}" in
+	*"MariaDB"*)
+		TYPE="MariaDB"
+		;;
+esac
+
+SERVER_VERSION=$(mysql -e "SELECT VERSION()" --skip-column-names ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}")
+VERSION=$(echo "${SERVER_VERSION}" | grep -o '^[^-]*')
+MAJOR=$(echo "${VERSION}" | cut -d. -f1)
+MINOR=$(echo "${VERSION}" | cut -d. -f2)
+
+echo "Detected ${TYPE} at version ${MAJOR}.${MINOR}"
+
+mysql() {
+	if [ "${TYPE}" == "MySQL" ]; then
+		/usr/bin/env mysql "$@"
+	else
+		/usr/bin/env mariadb "$@"
+	fi
+}
+
+echo 'Checking if database is ready...'
 while ! mysql ${HOST_STRING} --user="${USER}" "${PASSWORD_STRING}" --execute="SHOW DATABASES;" | grep 'information_schema' >/dev/null;
 do
-  echo 'Waiting for MySQL...'
+  echo 'Waiting for database...'
   sleep 5
   i=$((i+1))
   if [ $i -gt 36 ]; then
-	echo 'MySQL failed to start. Aborting.'
+	echo 'Database failed to start. Aborting.'
 	exit 1
   fi
 done
 
-# Prepare the database for running the tests with a MySQL version 8.0 or higher.
+# Prepare the database for running the tests with MariaDB, or MySQL 8.0+
 install_mysql_db_8_0_plus() {
 	set -ex
 	mysql -e "CREATE DATABASE IF NOT EXISTS \`${TEST_DB}\`;" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
@@ -89,21 +112,7 @@ install_mysql_db_lower_than_8_0() {
 	mysql -e "GRANT ALL ON \`${TEST_DB}_scaffold\`.* TO '${TEST_USER}'@'%' IDENTIFIED BY '${TEST_PASSWORD}'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 }
 
-VERSION_STRING=$(mysql -e "SELECT VERSION()" --skip-column-names ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}")
-VERSION=$(echo "${VERSION_STRING}" | grep -o '^[^-]*')
-MAJOR=$(echo "${VERSION}" | cut -d. -f1)
-MINOR=$(echo "${VERSION}" | cut -d. -f2)
-TYPE="MySQL"
-case "${VERSION_STRING}" in
-	*"MariaDB"*)
-		TYPE="MariaDB"
-		;;
-esac
-
-echo "Detected ${TYPE} at version ${MAJOR}.${MINOR}"
-
-
-if [ "${TYPE}" != "MariaDB" ] && [ "${MAJOR}" -ge 8 ]; then
+if [ "${TYPE}" == "MariaDB" ] || [ "${MAJOR}" -ge 8 ]; then
 	install_mysql_db_8_0_plus
 else
 	install_mysql_db_lower_than_8_0

src/Context/FeatureContext.php

@@ -959,6 +959,9 @@ private function set_cache_dir() {
 	 * @param bool $add_database Optional. Whether to add dbname to the $sql_cmd. Default false.
 	 */
 	private static function run_sql( $sql_cmd, $assoc_args = [], $add_database = false ) {
+		$binary  = 'mariadb' === Utils\get_db_type() ? 'mariadb' : 'mysql';
+		$sql_cmd = "$binary $sql_cmd";
+
 		$default_assoc_args = [
 			'host' => self::$db_settings['dbhost'],
 			'user' => self::$db_settings['dbuser'],
@@ -980,15 +983,15 @@ public function create_db() {
 		}
 
 		$dbname = self::$db_settings['dbname'];
-		self::run_sql( 'mysql --no-defaults', [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
+		self::run_sql( '--no-defaults', [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
 	}
 
 	public function drop_db() {
 		if ( 'sqlite' === self::$db_type ) {
 			return;
 		}
 		$dbname = self::$db_settings['dbname'];
-		self::run_sql( 'mysql --no-defaults', [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
+		self::run_sql( '--no-defaults', [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
 	}
 
 	public function proc( $command, $assoc_args = [], $path = '' ) {
@@ -1149,7 +1152,7 @@ public function install_wp( $subdir = '' ) {
 		// Disable WP Cron by default to avoid bogus HTTP requests in CLI context.
 		$config_extra_php = "if ( ! defined( 'DISABLE_WP_CRON' ) ) { define( 'DISABLE_WP_CRON', true ); }\n";
 
-		if ( 'mysql' === self::$db_type ) {
+		if ( 'sqlite' !== self::$db_type ) {
 			$this->create_db();
 		}
 		$this->create_run_dir();
@@ -1179,7 +1182,7 @@ public function install_wp( $subdir = '' ) {
 			if ( 'sqlite' === self::$db_type ) {
 				copy( "{$install_cache_path}.sqlite", "$run_dir/wp-content/database/.ht.sqlite" );
 			} else {
-				self::run_sql( 'mysql --no-defaults', [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
+				self::run_sql( '--no-defaults', [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
 			}
 		} else {
 			$this->proc( 'wp core install', $install_args, $subdir )->run_check();
@@ -1189,8 +1192,9 @@ public function install_wp( $subdir = '' ) {
 
 				self::dir_diff_copy( $run_dir, self::$cache_dir, $install_cache_path );
 
-				if ( 'mysql' === self::$db_type ) {
-					$mysqldump_binary          = Utils\force_env_on_nix_systems( 'mysqldump' );
+				if ( 'sqlite' !== self::$db_type ) {
+					$mysqldump_binary          = 'mariadb' === Utils\get_db_type() ? 'mariadb-dump' : 'mysqldump';
+					$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";
 					if ( $support_column_statistics ) {

utils/behat-tags.php

@@ -79,15 +79,22 @@ function version_tags(
 	$skip_tags[] = '@broken-trunk';
 }
 
-if ( 'sqlite' === getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
-	$skip_tags[] = '@require-mysql';
+switch ( getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
+	case 'mysql':
+		$skip_tags[] = '@require-mariadb';
+		$skip_tags[] = '@require-sqlite';
+		break;
+	case 'mariadb':
+		$skip_tags[] = '@require-mysql';
+		$skip_tags[] = '@require-sqlite';
+		break;
+	case 'sqlite':
+		$skip_tags[] = '@require-mariadb';
+		$skip_tags[] = '@require-mysql';
+		$skip_tags[] = '@require-mysql-or-mariadb';
+		break;
 }
 
-if ( 'sqlite' !== getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
-	$skip_tags[] = '@require-sqlite';
-}
-
-
 # Require PHP extension, eg 'imagick'.
 function extension_tags( $features_folder = 'features' ) {
 	$extension_tags = array();