diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2016-07-25 00:15:32 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2016-07-28 13:54:46 +0900 |
| commit | fe48c97e26e68fb32c5980416f8e3a1f4c57a479 (patch) | |
| tree | 14cfd7a7a96ee6c0325460993bb7913026b36cdd /activerecord | |
| parent | 56527bb737eb5e1d5531cafe99ce91d025565ead (diff) | |
| download | rails-fe48c97e26e68fb32c5980416f8e3a1f4c57a479.tar.gz rails-fe48c97e26e68fb32c5980416f8e3a1f4c57a479.tar.bz2 rails-fe48c97e26e68fb32c5980416f8e3a1f4c57a479.zip | |
`FinderMethods` uses `records` (`load_target`) when `loaded?` is true
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 8 | ||||
| -rw-r--r-- | activerecord/test/cases/associations_test.rb | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index db3037d8f9..56dee10df2 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -29,7 +29,7 @@ module ActiveRecord # instantiation of the actual post records. class CollectionProxy < Relation delegate(*(ActiveRecord::Calculations.public_instance_methods - [:count]), to: :scope) - delegate :find_nth, :exists?, :update_all, :arel, to: :scope + delegate :exists?, :update_all, :arel, to: :scope def initialize(klass, association) #:nodoc: @association = association diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index d255cad91b..916dca33bd 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -514,7 +514,7 @@ module ActiveRecord def find_take if loaded? - @records.first + records.first else @take ||= limit(1).records.first end @@ -531,7 +531,7 @@ module ActiveRecord MSG end if loaded? - @records[index] + records[index] else offset ||= offset_index @offsets[offset + index] ||= find_nth_with_limit_and_offset(index, 1, offset: offset).first @@ -557,7 +557,7 @@ module ActiveRecord def find_nth_from_last(index) if loaded? - @records[-index] + records[-index] else relation = if order_values.empty? && primary_key order(arel_attribute(primary_key).asc) @@ -578,7 +578,7 @@ module ActiveRecord def find_nth_with_limit_and_offset(index, limit, offset:) # :nodoc: if loaded? - @records[index, limit] + records[index, limit] else index += offset find_nth_with_limit(index, limit) diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb index 01a058918a..7412d48fe8 100644 --- a/activerecord/test/cases/associations_test.rb +++ b/activerecord/test/cases/associations_test.rb @@ -248,6 +248,8 @@ class AssociationProxyTest < ActiveRecord::TestCase test "first! works on loaded associations" do david = authors(:david) assert_equal david.posts.first, david.posts.reload.first! + assert david.posts.loaded? + assert_no_queries { david.posts.first! } end def test_reset_unloads_target |