diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-17 13:48:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-17 13:48:10 -0300 |
| commit | 80f66d405ce0e7c9be1ddf599104b9bcfe6c0e88 (patch) | |
| tree | 5f15203c11b3dcf9015085f8cb0db4ffe683c79a | |
| parent | 7b71a0dfc2509b5131eb4a49da099d74d1c3f2f0 (diff) | |
| parent | 38ccfe689d65ece84c07f2d90fc7aa570c2f27cc (diff) | |
| download | rails-80f66d405ce0e7c9be1ddf599104b9bcfe6c0e88.tar.gz rails-80f66d405ce0e7c9be1ddf599104b9bcfe6c0e88.tar.bz2 rails-80f66d405ce0e7c9be1ddf599104b9bcfe6c0e88.zip | |
Merge pull request #19376 from Empact/has-include
Drop `references_eager_loaded_tables?` test from `has_include?`
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 7f27e7b463..8f16de3519 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -182,7 +182,7 @@ module ActiveRecord private def has_include?(column_name) - eager_loading? || (includes_values.present? && ((column_name && column_name != :all) || references_eager_loaded_tables?)) + eager_loading? || (includes_values.present? && column_name && column_name != :all) end def perform_calculation(operation, column_name) |