diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-08-23 21:19:20 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-08-23 21:19:53 -0500 |
| commit | eb873f7133a59f28b7b9a82c33e94dc4de5c8b71 (patch) | |
| tree | 81077b788df6a8119cba238d95857d5d6825b6ed | |
| parent | bb75c337543a310ac6bed6f8e3287acf1592dac1 (diff) | |
| download | rails-eb873f7133a59f28b7b9a82c33e94dc4de5c8b71.tar.gz rails-eb873f7133a59f28b7b9a82c33e94dc4de5c8b71.tar.bz2 rails-eb873f7133a59f28b7b9a82c33e94dc4de5c8b71.zip | |
Prefer the mysql2 gem for MySQL database.ymls
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml | 17 |
1 files changed, 4 insertions, 13 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 ffc8a0a8cb..5d28c7c312 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,21 +1,12 @@ # 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. +# gem install mysql2 # # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: - adapter: mysql + adapter: mysql2 encoding: utf8 reconnect: false database: <%= app_name %>_development @@ -32,7 +23,7 @@ development: # 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 + adapter: mysql2 encoding: utf8 reconnect: false database: <%= app_name %>_test @@ -46,7 +37,7 @@ test: <% end -%> production: - adapter: mysql + adapter: mysql2 encoding: utf8 reconnect: false database: <%= app_name %>_production |