diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 11:08:57 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 11:08:57 +0530 |
| commit | 4939f95c9b0c1e68b442c94640831e05eff15a32 (patch) | |
| tree | 649e0aad98997ffe3906288df51442bc0c0b7557 | |
| parent | 7ad7c82caf53e0ef7f26221826ddc202a00f2631 (diff) | |
| download | rails-4939f95c9b0c1e68b442c94640831e05eff15a32.tar.gz rails-4939f95c9b0c1e68b442c94640831e05eff15a32.tar.bz2 rails-4939f95c9b0c1e68b442c94640831e05eff15a32.zip | |
Reapply "Remove optional join_dependency argument as Relation always supplies it" - Now without syntax errors
| -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..b2ae447d5e 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 |