diff options
| author | sdsykes <sdsykes@gmail.com> | 2009-09-07 13:22:19 +0300 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-13 02:57:53 -0700 |
| commit | dbe9fa03dfce54eb2b27341eed924b95e6afbdea (patch) | |
| tree | 0590196f9ee3509ceab66031326c9ab68d38c9c2 /activerecord | |
| parent | 091486fb98e77cbe588ddcbad55e361545185aab (diff) | |
| download | rails-dbe9fa03dfce54eb2b27341eed924b95e6afbdea.tar.gz rails-dbe9fa03dfce54eb2b27341eed924b95e6afbdea.tar.bz2 rails-dbe9fa03dfce54eb2b27341eed924b95e6afbdea.zip | |
Ruby 1.9 compat: corrected instance_methods check
[#3156 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |