Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reapply "Remove optional join_dependency argument as Relation always …

…supplies it" - Now without syntax errors
  • Loading branch information...
commit 4939f95c9b0c1e68b442c94640831e05eff15a32 1 parent 7ad7c82
@lifo lifo authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  activerecord/lib/active_record/associations.rb
View
3  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
Please sign in to comment.
Something went wrong with that request. Please try again.