diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-08-02 22:09:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-02 22:09:33 +0200 |
commit | 7f00b8fa9761615d0165b38b4d5427ca20bb41c7 (patch) | |
tree | 1afb984ba7cb8ae1113c1c59f3e53755d33788d2 /activerecord/lib | |
parent | fdc52ddb76d69235c01494a5f19c56cb9bddff0c (diff) | |
parent | a76ebe5019cdb26808ff513b9952cf7fb012ec20 (diff) | |
download | rails-7f00b8fa9761615d0165b38b4d5427ca20bb41c7.tar.gz rails-7f00b8fa9761615d0165b38b4d5427ca20bb41c7.tar.bz2 rails-7f00b8fa9761615d0165b38b4d5427ca20bb41c7.zip |
Merge pull request #26022 from kamipo/remove_unnecessary_set_inverse_instance
Remove unnecessary `set_inverse_instance` in finder methods
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 0eaa0a4f36..fea9f5d7f3 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -152,9 +152,7 @@ module ActiveRecord if loaded? n ? target.take(n) : target.first else - scope.take(n).tap do |record| - set_inverse_instance record if record.is_a? ActiveRecord::Base - end + scope.take(n) end end @@ -656,9 +654,7 @@ module ActiveRecord args.shift if args.first.is_a?(Hash) && args.first.empty? collection = fetch_first_nth_or_last_using_find?(args) ? scope : load_target - collection.send(type, *args).tap do |record| - set_inverse_instance record if record.is_a? ActiveRecord::Base - end + collection.send(type, *args) end end end |