提交 9b986ead 编写于 作者: R Roque Pinel

Fix the shadowing warning for `reflection`

上级 2f9d8895
......@@ -90,8 +90,8 @@ def merge_preloads
relation.preload! other.preload_values unless other.preload_values.empty?
relation.includes! other.includes_values unless other.includes_values.empty?
else
reflection = relation.klass.reflect_on_all_associations.find do |reflection|
reflection.class_name == other.klass.name
reflection = relation.klass.reflect_on_all_associations.find do |r|
r.class_name == other.klass.name
end || return
unless other.preload_values.empty?
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册