Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

1 files changed, 0 insertions, 51 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml
deleted file mode 100644
index f600e054cf..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/postgresql.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# PostgreSQL. Versions 7.4 and 8.x are supported.
-#
-# Install the ruby-postgres driver:
-#   gem install ruby-postgres
-# On Mac OS X:
-#   gem install ruby-postgres -- --include=/usr/local/pgsql
-# On Windows:
-#   gem install ruby-postgres
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: <%= app_name %>_development
-  pool: 5
-  username: <%= app_name %>
-  password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
-
-# 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
-  encoding: unicode
-  database: <%= app_name %>_test
-  pool: 5
-  username: <%= app_name %>
-  password:
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: <%= app_name %>_production
-  pool: 5
-  username: <%= app_name %>
-  password: