kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use @limit_value and @offset_value instead of calling arel

Browse source
This commit is contained in:
Pratik Naik 2010-01-20 22:20:33 +05:30
parent 8d31c9f3a0
commit 459e9b29d4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/relation.rb
View file

@ -80,7 +80,7 @@ module ActiveRecord
if block_given?
to_a.many? { |*block_args| yield(*block_args) }
else
arel.send(:taken).present? ? to_a.many? : size > 1
@limit_value.present? ? to_a.many? : size > 1
end
end

8
activerecord/lib/active_record/relation/finder_methods.rb
View file

@ -272,15 +272,15 @@ module ActiveRecord
result = where(primary_key.in(ids)).all
expected_size =
if arel.taken && ids.size > arel.taken
arel.taken
if @limit_value && ids.size > @limit_value
@limit_value
else
ids.size
end
# 11 ids with limit 3, offset 9 should give 2 results.
if arel.skipped && (ids.size - arel.skipped < expected_size)
expected_size = ids.size - arel.skipped
if @offset_value && (ids.size - @offset_value < expected_size)
expected_size = ids.size - @offset_value
end
if result.size == expected_size