aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/database.yml21
1 files changed, 19 insertions, 2 deletions
diff --git a/config/database.yml b/config/database.yml
index 71ad6f9b1..a3e357d3a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,13 +1,30 @@
+# SQLite version 3.x
+# gem 'activerecord-jdbcsqlite3-adapter'
+#
+# Configure Using Gemfile
+# gem 'activerecord-jdbcsqlite3-adapter'
+#
development:
adapter: jdbcpostgresql
- database: chouette2_dev
+ database: chouette_dev
encoding: utf8
username: chouette
password: chouette
+# 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: jdbcpostgresql
- database: chouette2_test
+ database: chouette_test
encoding: utf8
username: chouette
password: chouette
+
+production:
+ adapter: jdbcpostgresql
+ database: chouette2
+ encoding: utf8
+ host: localhost
+ username: chouette
+ password: chouette