nil protection - mysql however has a default for enums, which is why it wasn't a...

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index a80e11b70784068b19c360ea1c9218abb538b9f5..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,13 +12,11 @@
 #   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
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
+  encoding: utf8
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
@@ -29,6 +27,7 @@ test:
   username: osm_test
   password: osm_test
   host: localhost
+  encoding: utf8
 
 production:
   adapter: mysql
@@ -36,4 +35,4 @@ production:
   username: osm
   password: osm
   host: localhost
-
+  encoding: utf8