aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Moore <kevin@thinkpixellab.com>2011-05-17 10:29:01 -0700
committerKevin Moore <kevin@thinkpixellab.com>2011-05-17 10:30:54 -0700
commit523bac6dbaaff24f024555d665df98fe0f66ae0e (patch)
tree50ed630d0569526c9313a70d8846a9768ebd93f0
parent2b786ba215889d8133c431b4c279bd0cbbca6053 (diff)
downloadrails-523bac6dbaaff24f024555d665df98fe0f66ae0e.tar.gz
rails-523bac6dbaaff24f024555d665df98fe0f66ae0e.tar.bz2
rails-523bac6dbaaff24f024555d665df98fe0f66ae0e.zip
Fix for sqlite3.yml, mysql.yml
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml4
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml3
2 files changed, 4 insertions, 3 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 5d28c7c312..62dc7b2c48 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,7 +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'
#
# And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
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 90d87cc295..5989eaf9dd 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,5 +1,6 @@
# SQLite version 3.x
-# gem install sqlite3
+# Ensure the SQLite 3 gem is defined in your Gemfile
+# gem 'sqlite3'
development:
adapter: sqlite3
database: db/development.sqlite3