aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/database.yml.travis2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/database.yml.travis b/config/database.yml.travis
index 27552cbec..0335bca94 100644
--- a/config/database.yml.travis
+++ b/config/database.yml.travis
@@ -1,5 +1,5 @@
test:
- adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
+ adapter: jdbcpostgresql
database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
encoding: utf8
username: postgres \ No newline at end of file