提交 8e57deed 编写于 作者: P Pratik Naik

Remove optional join_dependency argument as Relation always supplies it

上级 47da00e9
...@@ -1465,8 +1465,7 @@ def add_touch_callbacks(reflection, touch_attribute) ...@@ -1465,8 +1465,7 @@ def add_touch_callbacks(reflection, touch_attribute)
after_destroy(method_name) after_destroy(method_name)
end end
def find_with_associations(options = {}, join_dependency = nil) def find_with_associations(options = {}, join_dependency)
join_dependency ||= JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
rows = select_all_rows(options, join_dependency) rows = select_all_rows(options, join_dependency)
join_dependency.instantiate(rows) join_dependency.instantiate(rows)
rescue ThrowResult rescue ThrowResult
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册