github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove optional join_dependency argument as Relation always supplies it"

Browse Source 
This reverts commit 8e57deed8b.
This commit is contained in:
Jeremy Kemper
2010-01-02 18:39:36 -08:00
parent c3d19eb950
commit 8571aa613f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
activerecord/lib/active_record/associations.rb
View File

@@ -1465,7 +1465,8 @@ module ActiveRecord
after_destroy(method_name)
end
def find_with_associations(options = {}, join_dependency)
def find_with_associations(options = {}, join_dependency = nil)
join_dependency ||= JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
rows = select_all_rows(options, join_dependency)
join_dependency.instantiate(rows)
rescue ThrowResult