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

Remove all aliases passing from JoinDependency

Browse source 
Follow up of 15367a2c67.
This commit is contained in:
Ryuta Kamizono 2018-06-20 21:52:09 +09:00
parent 15367a2c67
commit 94360451ea
1 changed files with 2 additions and 2 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

@ -230,7 +230,7 @@ module ActiveRecord
if model if model
construct(model, node, row, seen, model_cache) construct(model, node, row, seen, model_cache)
else else
model = construct_model(ar_parent, node, row, model_cache, id, aliases) model = construct_model(ar_parent, node, row, model_cache, id)
if node.reflection.scope && if node.reflection.scope &&
node.reflection.scope_for(node.base_klass.unscoped).readonly_value node.reflection.scope_for(node.base_klass.unscoped).readonly_value
@ -243,7 +243,7 @@ module ActiveRecord
end end
end end
def construct_model(record, node, row, model_cache, id, aliases) def construct_model(record, node, row, model_cache, id)
other = record.association(node.reflection.name) other = record.association(node.reflection.name)
model = model_cache[node][id] ||= model = model_cache[node][id] ||=