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 b44b9823a7a8adb09ba1837858effa6f4382f1fd..2c61345b1ec7bf3a18aa50c3a372d5bf5ceaa456 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -11,25 +11,28 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:

-  adapter: mysql
+  adapter: postgresql

   database: openstreetmap
   database: openstreetmap

-  username: openstreetmap
-  password: openstreetmap
-  host: localhost
+  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:
 
 # 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
   database: osm_test

-  username: root
-  password:
-  host: localhost
+  username: shaunmcdonald
+  password: postgres
+  #host: localhost
+  encoding: utf8

 
 production:
 
 production:

-  adapter: mysql
-  database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
-  host: 128.40.58.203
+  adapter: postgresql
+  database: osm
+  username: osm
+  password: osm
+  host: localhost
+  encoding: utf8