diff options
| author | git-marijus <mario@mariovavti.com> | 2018-02-06 12:48:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:48:34 +0100 |
| commit | 24a650d7ecc07e46a7d7cfb1ef3cd60cc7da791b (patch) | |
| tree | 2a782957d6340dd0135eba8ca2db661827821d54 /tests/travis/prepare_mysql.sh | |
| parent | cb042e32bc6d521050c48a5e4fe6c74f7a33ed4f (diff) | |
| parent | 210c91398da573d3c44bd1ff5bee4c65128c8686 (diff) | |
| download | volse-hubzilla-24a650d7ecc07e46a7d7cfb1ef3cd60cc7da791b.tar.gz volse-hubzilla-24a650d7ecc07e46a7d7cfb1ef3cd60cc7da791b.tar.bz2 volse-hubzilla-24a650d7ecc07e46a7d7cfb1ef3cd60cc7da791b.zip | |
Merge pull request #971 from dawnbreak/QA_testing
UnitTests for database classes and bit cleanup and docu
Diffstat (limited to 'tests/travis/prepare_mysql.sh')
| -rwxr-xr-x | tests/travis/prepare_mysql.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh index 095ad7e25..5b1c96d78 100755 --- a/tests/travis/prepare_mysql.sh +++ b/tests/travis/prepare_mysql.sh @@ -25,7 +25,7 @@ # Exit if anything fails set -e -echo "Preparing for MySQL ..." +echo "Preparing for MySQL/MariaDB ..." if [[ "$MYSQL_VERSION" == "5.7" ]]; then echo "Using MySQL 5.7 in Docker container, need to use TCP" @@ -41,13 +41,13 @@ mysql $PROTO -e "SHOW VARIABLES LIKE 'character_set%';" mysql $PROTO -e "SELECT @@sql_mode;" # Create Hubzilla database -mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS hubzilla;"; -mysql $PROTO -u root -e "CREATE USER 'hubzilla'@'localhost' IDENTIFIED BY 'hubzilla';" -mysql $PROTO -u root -e "GRANT ALL ON hubzilla.* TO 'hubzilla'@'localhost';" +mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS travis_hubzilla;"; +mysql $PROTO -u root -e "CREATE USER 'travis_hz'@'%' IDENTIFIED BY 'hubzilla';" +mysql $PROTO -u root -e "GRANT ALL ON travis_hubzilla.* TO 'travis_hz'@'%';" # Import table structure -mysql $PROTO -u root hubzilla < ./install/schema_mysql.sql +mysql $PROTO -u root travis_hubzilla < ./install/schema_mysql.sql # Show databases and tables mysql $PROTO -u root -e "SHOW DATABASES;" -mysql $PROTO -u root -e "USE hubzilla; SHOW TABLES;" +mysql $PROTO -u root -e "USE travis_hubzilla; SHOW TABLES;" |