From d20035910c186401c1d957462f4ad7894347c398 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 8 Jun 2008 22:34:09 -0700 Subject: Give a more informative error message instead of just raising a load error when mysql gem isn't installed --- .../lib/active_record/connection_adapters/mysql_adapter.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index cfd2402d9d..076b7f63c2 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -58,7 +58,14 @@ module ActiveRecord end # Require the MySQL driver and define Mysql::Result.all_hashes - require_library_or_gem('mysql') unless defined? Mysql + unless defined? Mysql + begin + require_library_or_gem('mysql') + rescue LoadError + $stderr.puts '!!! The bundled mysql.rb driver has been removed from Rails 2.2. Please install the mysql gem and try again: gem install mysql.' + raise + end + end MysqlCompat.define_all_hashes_method! mysql = Mysql.init -- cgit v1.2.3