aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-09-22 13:15:35 -0400
committerSantiago Pastorino <santiago@wyeworks.com>2010-09-22 14:20:56 -0300
commit48a108d55b6bf50c7960c1c1e10fd1f457fd1ada (patch)
tree8ac33e98305cb8adaea3c14dc5e78212032def78
parent0cf45c850ca33ec3e91560b19578072bffbe1525 (diff)
downloadrails-48a108d55b6bf50c7960c1c1e10fd1f457fd1ada.tar.gz
rails-48a108d55b6bf50c7960c1c1e10fd1f457fd1ada.tar.bz2
rails-48a108d55b6bf50c7960c1c1e10fd1f457fd1ada.zip
Error message should advice to use 'mysql2' gem.
If I create a new app using command rails new demo -d mysql then Gemfile contains 'mysql2' gem by default. However if mysql gem is missing then error message says raise "!!! Missing the mysql gem. Add it to your Gemfile: gem 'mysql', '2.8.1'" [#5569 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index d797f9c6c3..1d453e642d 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -19,11 +19,11 @@ module ActiveRecord
begin
require 'mysql'
rescue LoadError
- raise "!!! Missing the mysql gem. Add it to your Gemfile: gem 'mysql', '2.8.1'"
+ raise "!!! Missing the mysql gem. Add it to your Gemfile: gem 'mysql2'"
end
unless defined?(Mysql::Result) && Mysql::Result.method_defined?(:each_hash)
- raise "!!! Outdated mysql gem. Upgrade to 2.8.1 or later. In your Gemfile: gem 'mysql', '2.8.1'"
+ raise "!!! Outdated mysql gem. Upgrade to 2.8.1 or later. In your Gemfile: gem 'mysql', '2.8.1'. Or use gem 'mysql2'"
end
end