kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #29934 from kamipo/remove_join_information 

Remove useless `JoinInformation`
This commit is contained in:
Sean Griffin 2017-07-25 11:48:45 -04:00 committed by GitHub
parent 2a2349699d ea37a5709b
commit b6033773c1
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/associations/join_dependency.rb
View File

@ -174,9 +174,9 @@ module ActiveRecord
def make_join_constraints(parent, child, join_type, aliasing = false)
tables = aliasing ? table_aliases_for(parent, child) : child.tables
info = make_constraints(parent, child, tables, join_type)
joins = make_constraints(parent, child, tables, join_type)
[info] + child.children.flat_map { |c| make_join_constraints(child, c, join_type, aliasing) }
joins.concat child.children.flat_map { |c| make_join_constraints(child, c, join_type, aliasing) }
end
def table_aliases_for(parent, node)

4
activerecord/lib/active_record/associations/join_dependency/join_association.rb
View File

@ -23,8 +23,6 @@ module ActiveRecord
super && reflection == other.reflection
end
JoinInformation = Struct.new :joins
def join_constraints(foreign_table, foreign_klass, join_type, tables, chain)
joins = []
tables = tables.reverse
@ -51,7 +49,7 @@ module ActiveRecord
foreign_table, foreign_klass = table, klass
end
JoinInformation.new joins
joins
end
def table

7
activerecord/lib/active_record/relation/query_methods.rb
View File

@ -1014,11 +1014,8 @@ module ActiveRecord
klass, table, association_joins, join_list
)
join_infos = join_dependency.join_constraints stashed_association_joins, join_type
join_infos.each do |info|
info.joins.each { |join| manager.from(join) }
end
joins = join_dependency.join_constraints(stashed_association_joins, join_type)
joins.each { |join| manager.from(join) }
manager.join_sources.concat(join_list)