Remove duplication that is in the test helper. Adding tests for the passing of no...

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index a80e11b70784068b19c360ea1c9218abb538b9f5..2c61345b1ec7bf3a18aa50c3a372d5bf5ceaa456 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -11,29 +11,28 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
-  #database: openstreetmap
-  #username: openstreetmap
-  #password: openstreetmap
-  database: osm_test
-  username: osm_test
-  password: osm_test
-  host: localhost
+  adapter: postgresql
+  database: openstreetmap
+  username: shaunmcdonald
+  password: postgres
+  #host: localhost
+  encoding: utf8
 
 # 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: mysql
+  adapter: postgresql
   database: osm_test
-  username: osm_test
-  password: osm_test
-  host: localhost
+  username: shaunmcdonald
+  password: postgres
+  #host: localhost
+  encoding: utf8
 
 production:
-  adapter: mysql
+  adapter: postgresql
   database: osm
   username: osm
   password: osm
   host: localhost
-
+  encoding: utf8