diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-11-13 22:40:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-13 22:40:46 -0500 |
| commit | 2a8426c0f6f7a106ff2e6a7cec0851477e5b1c55 (patch) | |
| tree | ea2b3b40c869dac891f5d49291f01e2d282971a0 /activerecord/lib/active_record | |
| parent | 72717e68af8a99a30faf67d3245ecca638566d89 (diff) | |
| parent | 28708c7a8a4c9d4b835a0443460c0a38dd69982a (diff) | |
| download | rails-2a8426c0f6f7a106ff2e6a7cec0851477e5b1c55.tar.gz rails-2a8426c0f6f7a106ff2e6a7cec0851477e5b1c55.tar.bz2 rails-2a8426c0f6f7a106ff2e6a7cec0851477e5b1c55.zip | |
Merge pull request #27030 from kamipo/avoid_build_preloader
Avoid `build_preloader` if preloading is not needed
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index ef629dcb3b..8b30a48c1c 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -681,9 +681,10 @@ module ActiveRecord @records = eager_loading? ? find_with_associations.freeze : @klass.find_by_sql(arel, bound_attributes, &block).freeze preload = preload_values - preload += includes_values unless eager_loading? - preloader = build_preloader + preload += includes_values unless eager_loading? + preloader = nil preload.each do |associations| + preloader ||= build_preloader preloader.preload @records, associations end |