X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d9e070e06956801aba2378c1b79b4d9f13ae12ee..9b2248e8fb89a74c582393bb77d1d5e4d86d8e87:/config/database.yml diff --git a/config/database.yml b/config/database.yml index a80e11b70..c6fe06fdd 100644 --- 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 + adapter: postgresql + 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'. # 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 +# username: osm_test +# password: osm_test host: localhost + encoding: utf8 production: - adapter: mysql + adapter: postgresql database: osm - username: osm - password: osm +# username: osm +# password: osm host: localhost - + encoding: utf8