From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Sat, 16 May 2009 22:46:42 +0000 (+0000)
Subject: Back out the stupid change.
X-Git-Tag: live~7495
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0f46c392570d8eab0f2fa47404f96f7d9c77e8e6?hp=c424fa0ee57c276f0c80ef73598eb6e26a87cda2

Back out the stupid change.
---

diff --git a/config/mysql.example.database.yml b/config/database.yml
similarity index 80%
rename from config/mysql.example.database.yml
rename to config/database.yml
index cc3f9a1a5..c6fe06fdd 100644
--- a/config/mysql.example.database.yml
+++ b/config/database.yml
@@ -11,10 +11,10 @@
 # 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
-  username: openstreetmap
-  password: openstreetmap
+#  username: openstreetmap
+#  password: openstreetmap
   host: localhost
   encoding: utf8
 
@@ -22,17 +22,17 @@ development:
 # 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
diff --git a/config/postgres.example.database.yml b/config/postgres.example.database.yml
deleted file mode 100644
index 3908e51e5..000000000
--- a/config/postgres.example.database.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Postgresql version 8.3 recommended.
-# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions.
-#
-development:
-  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: postgresql
-  database: osm_test
-#  username: osm_test
-#  password: osm_test
-  host: localhost
-  encoding: utf8
-
-production:
-  adapter: postgresql
-  database: osm
-#  username: osm
-#  password: osm
-  host: localhost
-  encoding: utf8