Permalink
Browse files

Use @limit_value and @offset_value instead of calling arel

  • Loading branch information...
1 parent 8d31c9f commit 459e9b29d4b9922d5ce3f87dd62fd43e752ac3da @lifo lifo committed Jan 20, 2010
@@ -80,7 +80,7 @@ def many?
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
@@ -272,15 +272,15 @@ def find_some(ids)
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

0 comments on commit 459e9b2

Please sign in to comment.