From 5cef3254f71f2b0f06c98a4b18a5fc2a23bbac7b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 May 2014 16:34:01 +0200 Subject: [PATCH] [ticket/12470] Move setup of database to new .sh PHPBB3-12470 --- .travis.yml | 5 +---- travis/setup-database.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100755 travis/setup-database.sh diff --git a/.travis.yml b/.travis.yml index d8d931ae12..2e6e6d20fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,7 @@ install: - cd .. before_script: - - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi" - - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION script: - travis/phing-code-sniff.sh $DB $TRAVIS_PHP_VERSION diff --git a/travis/setup-database.sh b/travis/setup-database.sh new file mode 100755 index 0000000000..c1917042cd --- /dev/null +++ b/travis/setup-database.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# @copyright (c) 2014 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# +set -e +set -x + +DB=$1 +TRAVIS_PHP_VERSION=$2 + +if [ "$DB" == "postgres" ] +then + psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres + psql -c 'create database phpbb_tests;' -U postgres +fi + +if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysql" ] +then + mysql -e 'SET GLOBAL storage_engine=MyISAM;' +fi + +if [ "$DB" == "mysql" -o "$DB" == "mariadb" ] +then + mysql -e 'create database IF NOT EXISTS phpbb_tests;' +fi