Revert "Move Tip up higher so users who are fine with SQLite can skip to the next section"

This reverts commit 4bf057b866.

Reason: Prefer to keep the configuration of all databases at the same
level
This commit is contained in:
Vijay Dev
2011-11-13 22:07:54 +05:30
parent c8c08bd000
commit af51409de4

View File

@@ -335,17 +335,7 @@ and PostgreSQL "out of the box", and has plugins for many database systems. If
you are using a database in a production environment Rails most likely has an
adapter for it.
h5. Other database configuration options
TIP: You don't have to update the database configurations manually. If you look at the
options of the application generator, you will see that one of the options
is named <tt>--database</tt>. This option allows you to choose an adapter from a
list of the most used relational databases. You can even run the generator
repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
of the +config/database.yml+ file, your application will be configured for MySQL
instead of SQLite.
h6. Configuring a MySQL Database
h5. Configuring a MySQL Database
If you choose to use MySQL instead of the shipped SQLite3 database, your
+config/database.yml+ will look a little different. Here's the development
@@ -366,7 +356,7 @@ If your development computer's MySQL installation includes a root user with an
empty password, this configuration should work for you. Otherwise, change the
username and password in the +development+ section as appropriate.
h6. Configuring a PostgreSQL Database
h5. Configuring a PostgreSQL Database
If you choose to use PostgreSQL, your +config/database.yml+ will be customized
to use PostgreSQL databases:
@@ -381,9 +371,9 @@ development:
password:
</yaml>
h6. Configuring an SQLite3 Database for JRuby Platform
h5. Configuring an SQLite3 Database for JRuby Platform
If you choose to use SQLite3 and using JRuby, your +config/database.yml+ will
If you choose to use SQLite3 and are using JRuby, your +config/database.yml+ will
look a little different. Here's the development section:
<yaml>
@@ -392,9 +382,9 @@ development:
database: db/development.sqlite3
</yaml>
h6. Configuring a MySQL Database for JRuby Platform
h5. Configuring a MySQL Database for JRuby Platform
If you choose to use MySQL and using JRuby, your +config/database.yml+ will look
If you choose to use MySQL and are using JRuby, your +config/database.yml+ will look
a little different. Here's the development section:
<yaml>
@@ -405,9 +395,9 @@ development:
password:
</yaml>
h6. Configuring a PostgreSQL Database for JRuby Platform
h5. Configuring a PostgreSQL Database for JRuby Platform
Finally if you choose to use PostgreSQL and using JRuby, your
Finally if you choose to use PostgreSQL and are using JRuby, your
+config/database.yml+ will look a little different. Here's the development
section:
@@ -422,6 +412,14 @@ development:
Change the username and password in the +development+ section as appropriate.
TIP: You don't have to update the database configurations manually. If you look at the
options of the application generator, you will see that one of the options
is named <tt>--database</tt>. This option allows you to choose an adapter from a
list of the most used relational databases. You can even run the generator
repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
of the +config/database.yml+ file, your application will be configured for MySQL
instead of SQLite.
h4. Creating the Database
Now that you have your database configured, it's time to have Rails create an