diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-13 16:53:28 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-13 16:53:28 -0700 |
| commit | d00f9692b82deb8f90c4b3fb56f9e22cceb0e470 (patch) | |
| tree | 51e55b6176ef691cc2f57ada7b93e88e95b7406c /activerecord | |
| parent | 7fe6d2450695fdd8c2597acca404b7724ec48507 (diff) | |
| download | rails-d00f9692b82deb8f90c4b3fb56f9e22cceb0e470.tar.gz rails-d00f9692b82deb8f90c4b3fb56f9e22cceb0e470.tar.bz2 rails-d00f9692b82deb8f90c4b3fb56f9e22cceb0e470.zip | |
calling construct_relation_for_association_find is no longer necessary
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index b575d9ad61..3d687b927d 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -201,7 +201,7 @@ module ActiveRecord conditions = conditions.id if Base === conditions return false if !conditions - relation = construct_relation_for_association_find(construct_join_dependency) + relation = apply_join_dependency(self, construct_join_dependency) return false if ActiveRecord::NullRelation === relation relation = relation.except(:select, :order).select(ONE_AS_ONE).limit(1) |