mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove all aliases
passing from JoinDependency
Follow up of 15367a2c67
.
This commit is contained in:
parent
15367a2c67
commit
94360451ea
1 changed files with 2 additions and 2 deletions
|
@ -230,7 +230,7 @@ module ActiveRecord
|
|||
if model
|
||||
construct(model, node, row, seen, model_cache)
|
||||
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 &&
|
||||
node.reflection.scope_for(node.base_klass.unscoped).readonly_value
|
||||
|
@ -243,7 +243,7 @@ module ActiveRecord
|
|||
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)
|
||||
|
||||
model = model_cache[node][id] ||=
|
||||
|
|
Loading…
Reference in a new issue