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

Refactor build_joins to use select_association_list

Browse source
This commit is contained in:
Ryuta Kamizono 2020-05-17 20:54:57 +09:00
parent 838d3f73dd
commit c0c53ee9d2
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activerecord/lib/active_record/relation/query_methods.rb
View file

@ -1160,7 +1160,7 @@ module ActiveRecord
when ActiveRecord::Associations::JoinDependency
stashed_joins&.<< association
else
yield if block_given?
yield association if block_given?
end
end
result
@ -1211,13 +1211,8 @@ module ActiveRecord
end
end
joins.each do |join|
case join
when Hash, Symbol, Array
buckets[:association_join] << join
when ActiveRecord::Associations::JoinDependency
buckets[:stashed_join] << join
when Arel::Nodes::Join
buckets[:association_join] = select_association_list(joins, buckets[:stashed_join]) do |join|
if join.is_a?(Arel::Nodes::Join)
buckets[:join_node] << join
else
raise "unknown class: %s" % join.class.name