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

fix visibility of the relation construction methods

Browse source
This commit is contained in:
Aaron Patterson 2013-07-09 17:24:10 -07:00
parent 8004c91eb6
commit a4c0281dad
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -238,7 +238,7 @@ module ActiveRecord
raise RecordNotFound, error raise RecordNotFound, error
end end
protected private
def find_with_associations def find_with_associations
join_dependency = construct_join_dependency join_dependency = construct_join_dependency
@ -290,6 +290,12 @@ module ActiveRecord
id_rows.map {|row| row[primary_key]} id_rows.map {|row| row[primary_key]}
end end
def using_limitable_reflections?(reflections)
reflections.none? { |r| r.collection? }
end
protected
def find_with_ids(*ids) def find_with_ids(*ids)
expects_array = ids.first.kind_of?(Array) expects_array = ids.first.kind_of?(Array)
return ids.first if expects_array && ids.first.empty? return ids.first if expects_array && ids.first.empty?
@ -379,9 +385,5 @@ module ActiveRecord
end end
end end
end end
def using_limitable_reflections?(reflections)
reflections.none? { |r| r.collection? }
end
end end
end end