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

6 files changed, 0 insertions, 271 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml
deleted file mode 100644
index c0c3588be1..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/frontbase.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# FrontBase versions 4.x
-#
-# Get the bindings:
-#   gem install ruby-frontbase
-
-development:
-  adapter: frontbase
-  host: localhost
-  database: <%= app_name %>_development
-  username: <%= app_name %>
-  password: ''
-
-# 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: frontbase
-  host: localhost
-  database: <%= app_name %>_test
-  username: <%= app_name %>
-  password: ''
-
-production:
-  adapter: frontbase
-  host: localhost
-  database: <%= app_name %>_production
-  username: <%= app_name %>
-  password: ''
diff --git a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
deleted file mode 100644
index 2784a949fb..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# IBM Dataservers
-#
-# Home Page
-#   http://rubyforge.org/projects/rubyibm/
-#
-# To install the ibm_db gem:
-#
-#   On Linux:
-#       . /home/db2inst1/sqllib/db2profile
-#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
-#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
-#       gem install ibm_db
-#
-#   On Mac OS X 10.5:
-#       . /home/db2inst1/sqllib/db2profile
-#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
-#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
-#       export ARCHFLAGS="-arch i386"
-#       gem install ibm_db
-#
-#   On Mac OS X 10.6:
-#       . /home/db2inst1/sqllib/db2profile
-#       export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
-#       export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib64
-#       export ARCHFLAGS="-arch x86_64"
-#       gem install ibm_db
-#
-#   On Windows:
-#       Issue the command: gem install ibm_db
-#
-# For more details on the installation and the connection parameters below,
-# please refer to the latest documents at http://rubyforge.org/docman/?group_id=2361
-
-development:
-  adapter:     ibm_db
-  username:    db2inst1
-  password:
-  database:    <%= app_name[0,4] %>_dev
-  #schema:      db2inst1
-  #host:        localhost
-  #port:        50000
-  #account:     my_account
-  #app_user:    my_app_user
-  #application: my_application
-  #workstation: my_workstation
-
-test:
-  adapter:     ibm_db
-  username:    db2inst1
-  password:
-  database:    <%= app_name[0,4] %>_tst
-  #schema:      db2inst1
-  #host:        localhost
-  #port:        50000
-  #account:     my_account
-  #app_user:    my_app_user
-  #application: my_application
-  #workstation: my_workstation
-
-production:
-  adapter:     ibm_db
-  username:    db2inst1
-  password:
-  database:    <%= app_name[0,8] %>
-  #schema:      db2inst1
-  #host:        localhost
-  #port:        50000
-  #account:     my_account
-  #app_user:    my_app_user
-  #application: my_application
-  #workstation: my_workstation
diff --git a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/generators/rails/app/templates/config/databases/mysql.yml
deleted file mode 100644
index 6bf2f7b1fd..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/mysql.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: <%= app_name %>_development
-  pool: 5
-  username: root
-  password:
-<% if mysql_socket -%>
-  socket: <%= mysql_socket %>
-<% else -%>
-  host: localhost
-<% end -%>
-
-# 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
-  encoding: utf8
-  reconnect: false
-  database: <%= app_name %>_test
-  pool: 5
-  username: root
-  password:
-<% if mysql_socket -%>
-  socket: <%= mysql_socket %>
-<% else -%>
-  host: localhost
-<% end -%>
-
-production:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: <%= app_name %>_production
-  pool: 5
-  username: root
-  password: 
-<% if mysql_socket -%>
-  socket: <%= mysql_socket %>
-<% else -%>
-  host: localhost
-<% end -%>
diff --git a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/generators/rails/app/templates/config/databases/oracle.yml
deleted file mode 100644
index a1883f6256..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/oracle.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Oracle/OCI 8i, 9, 10g
-#
-# Requires Ruby/OCI8:
-#  http://rubyforge.org/projects/ruby-oci8/
-#
-# Specify your database using any valid connection syntax, such as a
-# tnsnames.ora service name, or a SQL connect url string of the form:
-#
-#   //host:[port][/service name]
-#
-# By default prefetch_rows (OCI_ATTR_PREFETCH_ROWS) is set to 100. And
-# until true bind variables are supported, cursor_sharing is set by default
-# to 'similar'. Both can be changed in the configation below; the defaults
-# are equivalent to specifying:
-#
-#  prefetch_rows: 100
-#  cursor_sharing: similar
-#
-
-development:
-  adapter: oracle
-  database: <%= app_name %>_development
-  username: <%= app_name %>
-  password:
-
-# 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: oracle
-  database: <%= app_name %>_test
-  username: <%= app_name %>
-  password:
-
-production:
-  adapter: oracle
-  database: <%= app_name %>_production
-  username: <%= app_name %>
-  password: 
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:
diff --git a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml
deleted file mode 100644
index 025d62a8d8..0000000000
--- a/railties/lib/generators/rails/app/templates/config/databases/sqlite3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# 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: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000