use $DB for config

ds125v · Nov 12, 2012 · 93e55ac · 93e55ac
1 parent df261a4
commit 93e55ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,11 @@ php:
   - "5.4"
   - "5.3"
 env:
- - DB=mysql
- - DB=postgres
+ - DB=mysqli
+ - DB=pgsql
 before_script:
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database moodle default character set UTF8 collate UTF8_bin;'; fi"
- - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database moodle;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysqli' ]; then mysql -e 'create database moodle default character set UTF8 collate UTF8_bin;'; fi"
+ - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database moodle;' -U postgres; fi"
  - pear channel-discover pear.phpunit.de
  - pear channel-discover pear.symfony.com
  - pear install pear.phpunit.de/DbUnit

diff --git a/config-travis.php b/config-travis.php
@@ -38,7 +38,7 @@
 // will be stored.  This database must already have been created         //
 // and a username/password created to access it.                         //
 
-$CFG->dbtype    = 'mysqli';      // 'pgsql', 'mysqli', 'mssql', 'sqlsrv' or 'oci'
+$CFG->dbtype    = '$DB';      // 'pgsql', 'mysqli', 'mssql', 'sqlsrv' or 'oci'
 $CFG->dblibrary = 'native';     // 'native' only at the moment
 $CFG->dbhost    = 'localhost';  // eg 'localhost' or 'db.isp.com' or IP
 $CFG->dbname    = 'moodle';     // database name, eg moodle