aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2017-11-26 10:22:54 -0500
committereileencodes <eileencodes@gmail.com>2017-11-26 10:22:54 -0500
commitd7ab5710916f8ee58a970312e9bc9276022fe3a6 (patch)
tree9ddce9ac775c41d93a8b6a9bb76e767f1b5c39a0
parentcdc46750ca4ae2fc21020b36d5b94fd708d7b5d2 (diff)
downloadrails-d7ab5710916f8ee58a970312e9bc9276022fe3a6.tar.gz
rails-d7ab5710916f8ee58a970312e9bc9276022fe3a6.tar.bz2
rails-d7ab5710916f8ee58a970312e9bc9276022fe3a6.zip
Revert "Merge pull request #31006 from rails/kamipo/ordinal_methods_should_respect_loaded_records"
This reverts commit 0f79ab91150b4cdb6c018530978a3395962c7a02, reversing changes made to d575f7f2e737739302a0e8210d01c10f5d4e2c35. This PR philosophically conflicts with #30800 and Matthew thinks we should hold off merging this until we find concensus. Reverting since we're about to cut a release for 5.2.
-rw-r--r--activerecord/lib/active_record/relation.rb1
-rw-r--r--activerecord/test/cases/finder_test.rb16
2 files changed, 0 insertions, 17 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index d3b8091665..081ef5771f 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -544,7 +544,6 @@ module ActiveRecord
end
@records.each(&:readonly!) if readonly_value
- @offsets = {} unless @offsets.empty?
@loaded = true
@records
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 93957ff50f..e936c56ab8 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -691,22 +691,6 @@ class FinderTest < ActiveRecord::TestCase
assert_kind_of Array, Topic.last(5)
end
- def test_first_should_respect_loaded_records
- authors = Author.order(:name)
-
- assert_equal authors(:bob), authors.first
-
- aaron = authors.create!(name: "Aaron")
-
- authors.load
-
- assert_no_queries do
- assert_equal aaron, authors.first
- assert_equal authors(:bob), authors.second
- assert_not_equal authors.first, authors.second
- end
- end
-
def test_unexisting_record_exception_handling
assert_raise(ActiveRecord::RecordNotFound) {
Topic.find(1).parent