Merge 14394:14533 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index c0b5dd98c2bc707882f699322ce22f485c3d89d0..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,10 +12,11 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql

-  database: osm
-  username: osm
-  password: osm
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap

   host: localhost
   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,9 +24,10 @@ 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


@@ -33,4 +35,4 @@ production:
   username: osm
   password: osm
   host: localhost
   username: osm
   password: osm
   host: localhost

-
+  encoding: utf8