aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-17 21:42:50 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-17 21:42:50 -0700
commitc2105d3b2099324bb003df7a53a2b146236a7a4e (patch)
treee33bbe8f16af706b9b4270161aaae48ec90f85d2
parent9773f6e1aab6d4e6e714f1582d18b0fbbd8112f7 (diff)
parent28cf893d6c95bd4428b030894898587c79a8c6b1 (diff)
downloadrails-c2105d3b2099324bb003df7a53a2b146236a7a4e.tar.gz
rails-c2105d3b2099324bb003df7a53a2b146236a7a4e.tar.bz2
rails-c2105d3b2099324bb003df7a53a2b146236a7a4e.zip
Merge pull request #1114 from arunagw/databaseyml_doc
Putting back mysql2 and sqlite3 in database.yml docs. In case people use
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml3
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml2
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
index 62dc7b2c48..cce166c7c3 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
@@ -1,4 +1,7 @@
# MySQL. Versions 4.1 and 5.0 are recommended.
+#
+# Install the MYSQL driver
+# gem install mysql2
#
# Ensure the MySQL gem is defined in your Gemfile
# gem 'mysql2'
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
index 5989eaf9dd..51a4dd459d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
@@ -1,4 +1,6 @@
# SQLite version 3.x
+# gem install sqlite3
+#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development: