diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 04:09:36 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 04:09:36 +0530 |
| commit | 8e57deed8b4efad6ea1c551f415b74596111f890 (patch) | |
| tree | ada0d30075325a48f5934aa5e9a74e7e9fcf5288 /activerecord | |
| parent | 47da00e94b5b35fb98add859feae1bfc47d969ec (diff) | |
| download | rails-8e57deed8b4efad6ea1c551f415b74596111f890.tar.gz rails-8e57deed8b4efad6ea1c551f415b74596111f890.tar.bz2 rails-8e57deed8b4efad6ea1c551f415b74596111f890.zip | |
Remove optional join_dependency argument as Relation always supplies it
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index a2cb41f9ab..d74b21b690 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1465,8 +1465,7 @@ module ActiveRecord 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 |