From dbe9fa03dfce54eb2b27341eed924b95e6afbdea Mon Sep 17 00:00:00 2001 From: sdsykes Date: Mon, 7 Sep 2009 13:22:19 +0300 Subject: Ruby 1.9 compat: corrected instance_methods check [#3156 state:committed] Signed-off-by: Jeremy Kemper --- activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 4edb64c2c0..1bb1c0bc15 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -8,7 +8,8 @@ module MysqlCompat #:nodoc: raise 'Mysql not loaded' unless defined?(::Mysql) target = defined?(Mysql::Result) ? Mysql::Result : MysqlRes - return if target.instance_methods.include?('all_hashes') + return if target.instance_methods.include?('all_hashes') || + target.instance_methods.include?(:all_hashes) # Ruby driver has a version string and returns null values in each_hash # C driver >= 2.7 returns null values in each_hash -- cgit v1.2.3