Permalink
Browse files

Reapply "Remove optional join_dependency argument as Relation always …

…supplies it" - Now without syntax errors
  • Loading branch information...
1 parent 7ad7c82 commit 4939f95c9b0c1e68b442c94640831e05eff15a32 @lifo lifo committed Jan 3, 2010
Showing with 1 addition and 2 deletions.
  1. +1 −2 activerecord/lib/active_record/associations.rb
@@ -1465,8 +1465,7 @@ def add_touch_callbacks(reflection, touch_attribute)
after_destroy(method_name)
end
- def find_with_associations(options = {}, join_dependency = nil)
- join_dependency ||= JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
+ def find_with_associations(options, join_dependency)
rows = select_all_rows(options, join_dependency)
join_dependency.instantiate(rows)
rescue ThrowResult

0 comments on commit 4939f95

Please sign in to comment.