aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/database.yml33
1 files changed, 25 insertions, 8 deletions
diff --git a/config/database.yml b/config/database.yml
index 25a46be1b..60f1d032f 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,11 +1,28 @@
-test:
- adapter: <%= ENV.fetch 'RAILS_DB_ADAPTER', 'postgis' %>
+default: &default
+ adapter: postgis
encoding: unicode
- pool: <%= ENV.fetch 'RAILS_DB_POOLSIZE', '5' %>
- host: <%= ENV.fetch 'RAILS_DB_HOST', 'localhost' %>
- port: <%= ENV.fetch 'RAILS_DB_PORT', '5432' %>
+ port: 5432
+ host: localhost
schema_search_path: 'public,shared_extensions'
+ username: chouette
+ password: chouette
postgis_schema: 'shared_extensions'
- database: <%= ENV.fetch 'RAILS_DB_NAME', 'stif_boiv_test' %>
- username: <%= ENV['RAILS_DB_USER'] || ENV['POSTGRESQL_ENV_POSTGRES_USER'] || 'jenkins' %>
- password: <%= ENV.fetch 'RAILS_DB_PASSWORD' || ENV['POSTGRESQL_ENV_POSTGRES_PASSWORD'] %>
+
+development:
+ <<: *default
+ database: chouette2
+
+# 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: &test
+ <<: *default
+ database: chouette_test
+
+production:
+ <<: *default
+ adapter: <%= ENV.fetch 'RAILS_DB_ADAPTER', 'postgis' %>
+ database: chouette2
+
+cucumber:
+ <<: *test