diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-20 17:38:32 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-20 17:38:32 +0900 |
commit | 3e50a1bcd4b5f3ce26ec94ba061d039c0a6f8062 (patch) | |
tree | cfd772beae014e0d63ac638c0450a407753acb44 /activerecord/lib/active_record/attribute_methods | |
parent | bf01cc6744a3593c6256ab6765d7d7a500696bd5 (diff) | |
parent | f3c866a743bc6edc9b67b241e65e6acfccfd3992 (diff) | |
download | rails-3e50a1bcd4b5f3ce26ec94ba061d039c0a6f8062.tar.gz rails-3e50a1bcd4b5f3ce26ec94ba061d039c0a6f8062.tar.bz2 rails-3e50a1bcd4b5f3ce26ec94ba061d039c0a6f8062.zip |
Merge pull request #30973 from k0kubun/prefer-block-parameter
Unify _read_attribute definition to use &block
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index 6e1275e990..ffac5313ad 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -42,16 +42,8 @@ module ActiveRecord # This method exists to avoid the expensive primary_key check internally, without # breaking compatibility with the read_attribute API - if defined?(JRUBY_VERSION) - # This form is significantly faster on JRuby, and this is one of our biggest hotspots. - # https://github.com/jruby/jruby/pull/2562 - def _read_attribute(attr_name, &block) # :nodoc: - @attributes.fetch_value(attr_name.to_s, &block) - end - else - def _read_attribute(attr_name) # :nodoc: - @attributes.fetch_value(attr_name.to_s) { |n| yield n if block_given? } - end + def _read_attribute(attr_name, &block) # :nodoc + @attributes.fetch_value(attr_name.to_s, &block) end alias :attribute :_read_attribute |