mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
fix visibility of the relation construction methods
This commit is contained in:
parent
8004c91eb6
commit
a4c0281dad
1 changed files with 7 additions and 5 deletions
|
@ -238,7 +238,7 @@ module ActiveRecord
|
|||
raise RecordNotFound, error
|
||||
end
|
||||
|
||||
protected
|
||||
private
|
||||
|
||||
def find_with_associations
|
||||
join_dependency = construct_join_dependency
|
||||
|
@ -290,6 +290,12 @@ module ActiveRecord
|
|||
id_rows.map {|row| row[primary_key]}
|
||||
end
|
||||
|
||||
def using_limitable_reflections?(reflections)
|
||||
reflections.none? { |r| r.collection? }
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def find_with_ids(*ids)
|
||||
expects_array = ids.first.kind_of?(Array)
|
||||
return ids.first if expects_array && ids.first.empty?
|
||||
|
@ -379,9 +385,5 @@ module ActiveRecord
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
def using_limitable_reflections?(reflections)
|
||||
reflections.none? { |r| r.collection? }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue