Fix and update travis config

2 files changed, 16 insertions, 30 deletions

diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol
deleted file mode 100644
index 1936af0e1..000000000
--- a/config/database.yml.ccontrol
+++ /dev/null
@@ -1,22 +0,0 @@
-development:
-  adapter: jdbcpostgresql
-  database: chouette2_dev
-  encoding: utf8
-  username: chouette
-  password: chouette
-
-test:
-  adapter: jdbcpostgresql
-  database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
-  encoding: utf8
-  username: chouette
-  password: chouette
-
-# When war is created by jenkins
-production:
-  adapter: jdbcpostgresql
-  database: chouette2
-  encoding: utf8
-  host: localhost
-  username: chouette
-  password: chouette    
diff --git a/config/database.yml.travis b/config/database.yml.travis
index 40a95e668..c554142f5 100644
--- a/config/database.yml.travis
+++ b/config/database.yml.travis
@@ -1,11 +1,19 @@
-development:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
-  database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_d" : "chouette_" + ENV["GIT_BRANCH"] + "_d" %>
-  encoding: utf8
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  port: 5432
+  host: localhost
+  schema_search_path: "public"
   username: postgres
 
+development:
+  <<: *default
+  database: chouette_dev
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %>
-  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
+  <<: *default
+  database: chouette_test
\ No newline at end of file