diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-11 04:28:28 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-11 04:28:28 +0900 |
| commit | 412db710dfa6ed84654068576b1841966d7f89b2 (patch) | |
| tree | edd43195cf3ccb3f9c9d87a552fdc13f7e3242af /activerecord/lib/active_record/relation.rb | |
| parent | b4f64cb1595f2abd3d7e47805273f4f029718829 (diff) | |
| download | rails-412db710dfa6ed84654068576b1841966d7f89b2.tar.gz rails-412db710dfa6ed84654068576b1841966d7f89b2.tar.bz2 rails-412db710dfa6ed84654068576b1841966d7f89b2.zip | |
Use `apply_join_dependency` instead of meaningless named `find_with_associations`
`find_with_associations` is meaningless name in this point since it just
contain `construct_join_dependency` and `apply_join_dependency`, does
not contain finding anything.
If `apply_join_dependency` returns `relation` and `join_dependency` then
`find_with_associations` is no longer needed.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 4df3864d07..10be583ef4 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -430,7 +430,7 @@ module ActiveRecord relation = self if eager_loading? - find_with_associations { |rel, _| relation = rel } + apply_join_dependency { |rel, _| relation = rel } end conn = klass.connection @@ -533,7 +533,7 @@ module ActiveRecord skip_query_cache_if_necessary do @records = if eager_loading? - find_with_associations do |relation, join_dependency| + apply_join_dependency do |relation, join_dependency| if ActiveRecord::NullRelation === relation [] else |