Fix PostgreSQL and MySQL setup on Travis CI

Note that the PostgreSQL tests still don't work on some architectures.

Closes GH-5607.
This commit is contained in:
Gerard Roche 2020-05-20 20:03:10 +01:00 committed by Nikita Popov
parent d1dde094f2
commit cf3d3cd86f
2 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,4 @@
#!/bin/bash
if [ -n "$ARM64" ]; then
sudo mysql -e 'CREATE USER "travis"@"localhost" IDENTIFIED BY ""'
sudo mysql -e 'GRANT ALL PRIVILEGES ON *.* TO "travis"@"localhost"'
fi
mysql -e "CREATE DATABASE IF NOT EXISTS test"
#!/bin/sh
set -ev
mysql -vvv -e "CREATE DATABASE IF NOT EXISTS test"

View File

@ -1,6 +1,8 @@
#!/bin/bash
echo '
<?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc"
if [ -z "$ARM64" -o -z "$S390X"]; then
psql -c 'create database test;' -U postgres
#!/bin/sh
set -ev
# PostgreSQL tests currently don't work on some architectures.
if test -z "${ARM64}${S390X}"; then
psql -c "ALTER USER postgres PASSWORD 'postgres';" -U postgres
psql -c "CREATE DATABASE test;" -U postgres
fi