Merge 14394:14533 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index a972b44b376dc1123daa720d669a0f9b35bc53b6..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -15,7 +15,8 @@ development:
   database: openstreetmap
   username: openstreetmap
   password: openstreetmap
   database: openstreetmap
   username: openstreetmap
   password: openstreetmap

-  host: 128.40.58.203
+  host: localhost
+  encoding: utf8

 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.


@@ -23,13 +24,15 @@ development:
 test:
   adapter: mysql
   database: osm_test
 test:
   adapter: mysql
   database: osm_test

-  username: root
-  password:
+  username: osm_test
+  password: osm_test

   host: localhost
   host: localhost

+  encoding: utf8

 
 production:
   adapter: mysql
 
 production:
   adapter: mysql

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