diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-06-26 11:11:06 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-06-26 11:11:06 +0100 |
| commit | bce4b56ef9d0c516695b7bc5ef66f7a92f4415f6 (patch) | |
| tree | c9b9543589473fbf10fc449feae3240561812cc7 | |
| parent | 5a4ccf005f22d36bedf47c88e16c3fec49c5b2a8 (diff) | |
| parent | 3d81bbed2acf65c66c73aeb3be028d66ec8c6e55 (diff) | |
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | config/database.yml-test | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6a6b73e90..3351bed2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,9 @@ before_install: - gem update --system 2.1.11 - gem install rake --version=0.9.2.2 - git submodule update --init --recursive - - psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres + - psql -c "create database template_utf8 template template0 encoding 'UTF-8';" -U postgres + - psql -c "update pg_database set datistemplate=true where datname='template_utf8';" -U postgres + - psql -c "create database foi_test template template_utf8;" -U postgres - cp config/database.yml-test config/database.yml - cp config/general.yml-example config/general.yml - cp config/newrelic.yml-example config/newrelic.yml diff --git a/config/database.yml-test b/config/database.yml-test index ff6e2013a..64eafd82d 100644 --- a/config/database.yml-test +++ b/config/database.yml-test @@ -1,4 +1,5 @@ test: adapter: postgresql + template: template_utf8 database: foi_test username: postgres |