提交 15367a2c 编写于 作者: R Ryuta Kamizono

Remove useless `aliases` argument from `JoinDependency#construct`

Since `aliases` is a part of `JoinDependency` and already cached at
1a723c65.
上级 c4b58af3
......@@ -116,7 +116,7 @@ def instantiate(result_set, &block)
result_set.each { |row_hash|
parent_key = primary_key ? row_hash[primary_key] : row_hash
parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, &block)
construct(parent, join_root, row_hash, seen, model_cache, aliases)
construct(parent, join_root, row_hash, seen, model_cache)
}
end
......@@ -204,7 +204,7 @@ def build(associations, base_klass)
end
end
def construct(ar_parent, parent, row, seen, model_cache, aliases)
def construct(ar_parent, parent, row, seen, model_cache)
return if ar_parent.nil?
parent.children.each do |node|
......@@ -213,7 +213,7 @@ def construct(ar_parent, parent, row, seen, model_cache, aliases)
other.loaded!
elsif ar_parent.association_cached?(node.reflection.name)
model = ar_parent.association(node.reflection.name).target
construct(model, node, row, seen, model_cache, aliases)
construct(model, node, row, seen, model_cache)
next
end
......@@ -228,7 +228,7 @@ def construct(ar_parent, parent, row, seen, model_cache, aliases)
model = seen[ar_parent.object_id][node.base_klass][id]
if model
construct(model, node, row, seen, model_cache, aliases)
construct(model, node, row, seen, model_cache)
else
model = construct_model(ar_parent, node, row, model_cache, id, aliases)
......@@ -238,7 +238,7 @@ def construct(ar_parent, parent, row, seen, model_cache, aliases)
end
seen[ar_parent.object_id][node.base_klass][id] = model
construct(model, node, row, seen, model_cache, aliases)
construct(model, node, row, seen, model_cache)
end
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册