Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove duplicated private method in ActiveRecord::FinderMethods #28177

Merged
merged 1 commit into from
Feb 26, 2017
Merged

Remove duplicated private method in ActiveRecord::FinderMethods #28177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
202 changes: 100 additions & 102 deletions activerecord/lib/active_record/relation/finder_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,140 +430,138 @@ def using_limitable_reflections?(reflections)
reflections.none?(&:collection?)
end

private
def find_with_ids(*ids)
raise UnknownPrimaryKey.new(@klass) if primary_key.nil?

def find_with_ids(*ids)
raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
expects_array = ids.first.kind_of?(Array)
return ids.first if expects_array && ids.first.empty?

expects_array = ids.first.kind_of?(Array)
return ids.first if expects_array && ids.first.empty?
ids = ids.flatten.compact.uniq

ids = ids.flatten.compact.uniq

case ids.size
when 0
raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
when 1
result = find_one(ids.first)
expects_array ? [ result ] : result
else
find_some(ids)
end
rescue ::RangeError
raise RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
case ids.size
when 0
raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
when 1
result = find_one(ids.first)
expects_array ? [ result ] : result
else
find_some(ids)
end
rescue ::RangeError
raise RecordNotFound, "Couldn't find #{@klass.name} with an out of range ID"
end

def find_one(id)
if ActiveRecord::Base === id
raise ArgumentError, <<-MSG.squish
You are passing an instance of ActiveRecord::Base to `find`.
Please pass the id of the object by calling `.id`.
MSG
end

relation = where(primary_key => id)
record = relation.take

raise_record_not_found_exception!(id, 0, 1) unless record

record
def find_one(id)
if ActiveRecord::Base === id
raise ArgumentError, <<-MSG.squish
You are passing an instance of ActiveRecord::Base to `find`.
Please pass the id of the object by calling `.id`.
MSG
end

def find_some(ids)
return find_some_ordered(ids) unless order_values.present?
relation = where(primary_key => id)
record = relation.take

raise_record_not_found_exception!(id, 0, 1) unless record

result = where(primary_key => ids).to_a
record
end

expected_size =
if limit_value && ids.size > limit_value
limit_value
else
ids.size
end
def find_some(ids)
return find_some_ordered(ids) unless order_values.present?

# 11 ids with limit 3, offset 9 should give 2 results.
if offset_value && (ids.size - offset_value < expected_size)
expected_size = ids.size - offset_value
end
result = where(primary_key => ids).to_a

if result.size == expected_size
result
expected_size =
if limit_value && ids.size > limit_value
limit_value
else
raise_record_not_found_exception!(ids, result.size, expected_size)
ids.size
end

# 11 ids with limit 3, offset 9 should give 2 results.
if offset_value && (ids.size - offset_value < expected_size)
expected_size = ids.size - offset_value
end

def find_some_ordered(ids)
ids = ids.slice(offset_value || 0, limit_value || ids.size) || []
if result.size == expected_size
result
else
raise_record_not_found_exception!(ids, result.size, expected_size)
end
end

result = except(:limit, :offset).where(primary_key => ids).records
def find_some_ordered(ids)
ids = ids.slice(offset_value || 0, limit_value || ids.size) || []

if result.size == ids.size
pk_type = @klass.type_for_attribute(primary_key)
result = except(:limit, :offset).where(primary_key => ids).records

records_by_id = result.index_by(&:id)
ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
else
raise_record_not_found_exception!(ids, result.size, ids.size)
end
end
if result.size == ids.size
pk_type = @klass.type_for_attribute(primary_key)

def find_take
if loaded?
records.first
else
@take ||= limit(1).records.first
end
records_by_id = result.index_by(&:id)
ids.map { |id| records_by_id.fetch(pk_type.cast(id)) }
else
raise_record_not_found_exception!(ids, result.size, ids.size)
end
end

def find_take_with_limit(limit)
if loaded?
records.take(limit)
else
limit(limit).to_a
end
def find_take
if loaded?
records.first
else
@take ||= limit(1).records.first
end
end

def find_nth(index)
@offsets[offset_index + index] ||= find_nth_with_limit(index, 1).first
def find_take_with_limit(limit)
if loaded?
records.take(limit)
else
limit(limit).to_a
end
end

def find_nth_with_limit(index, limit)
if loaded?
records[index, limit] || []
def find_nth(index)
@offsets[offset_index + index] ||= find_nth_with_limit(index, 1).first
end

def find_nth_with_limit(index, limit)
if loaded?
records[index, limit] || []
else
relation = if order_values.empty? && primary_key
order(arel_attribute(primary_key).asc)
else
relation = if order_values.empty? && primary_key
order(arel_attribute(primary_key).asc)
else
self
end

relation = relation.offset(offset_index + index) unless index.zero?
relation.limit(limit).to_a
self
end

relation = relation.offset(offset_index + index) unless index.zero?
relation.limit(limit).to_a
end
end

def find_nth_from_last(index)
if loaded?
records[-index]
def find_nth_from_last(index)
if loaded?
records[-index]
else
relation = if order_values.empty? && primary_key
order(arel_attribute(primary_key).asc)
else
relation = if order_values.empty? && primary_key
order(arel_attribute(primary_key).asc)
else
self
end

relation.to_a[-index]
# TODO: can be made more performant on large result sets by
# for instance, last(index)[-index] (which would require
# refactoring the last(n) finder method to make test suite pass),
# or by using a combination of reverse_order, limit, and offset,
# e.g., reverse_order.offset(index-1).first
self
end
end

def find_last(limit)
limit ? records.last(limit) : records.last
relation.to_a[-index]
# TODO: can be made more performant on large result sets by
# for instance, last(index)[-index] (which would require
# refactoring the last(n) finder method to make test suite pass),
# or by using a combination of reverse_order, limit, and offset,
# e.g., reverse_order.offset(index-1).first
end
end

def find_last(limit)
limit ? records.last(limit) : records.last
end
end
end