@@ -60,6 +60,8 @@ if [ -n "${WP_CLI_TEST_DBPASS}" ]; then
6060 TEST_PASSWORD=" ${WP_CLI_TEST_DBPASS} "
6161fi
6262
63+ echo " Detecting database version..."
64+
6365TYPE=" MySQL"
6466CLIENT_VERSION=$( /usr/bin/env mysql --version 2> /dev/null)
6567case " ${CLIENT_VERSION} " in
@@ -68,13 +70,6 @@ case "${CLIENT_VERSION}" in
6870 ;;
6971esac
7072
71- SERVER_VERSION=$( mysql -e " SELECT VERSION()" --skip-column-names ${HOST_STRING} -u" ${USER} " " ${PASSWORD_STRING} " )
72- VERSION=$( echo " ${SERVER_VERSION} " | grep -o ' ^[^-]*' )
73- MAJOR=$( echo " ${VERSION} " | cut -d. -f1)
74- MINOR=$( echo " ${VERSION} " | cut -d. -f2)
75-
76- echo " Detected ${TYPE} at version ${MAJOR} .${MINOR} "
77-
7873mysql () {
7974 if [ " ${TYPE} " == " MySQL" ]; then
8075 /usr/bin/env mysql " $@ "
@@ -83,6 +78,13 @@ mysql() {
8378 fi
8479}
8580
81+ SERVER_VERSION=$( mysql -e " SELECT VERSION()" --skip-column-names ${HOST_STRING} -u" ${USER} " " ${PASSWORD_STRING} " )
82+ VERSION=$( echo " ${SERVER_VERSION} " | grep -o ' ^[^-]*' )
83+ MAJOR=$( echo " ${VERSION} " | cut -d. -f1)
84+ MINOR=$( echo " ${VERSION} " | cut -d. -f2)
85+
86+ echo " Detected ${TYPE} at version ${MAJOR} .${MINOR} "
87+
8688echo ' Checking if database is ready...'
8789while ! mysql ${HOST_STRING} --user=" ${USER} " " ${PASSWORD_STRING} " --execute=" SHOW DATABASES;" | grep ' information_schema' > /dev/null;
8890do
9597 fi
9698done
9799
100+ # Debugging
101+ mysql -e " SELECT user, host, plugin FROM mysql.user WHERE user = 'wp_cli_test';" ${HOST_STRING} -u" ${USER} " " ${PASSWORD_STRING} "
102+
98103# Prepare the database for running the tests with MariaDB, or MySQL 8.0+
99104install_mysql_db_8_0_plus () {
100105 set -ex
0 commit comments