diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-11-01 14:20:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 14:20:17 -0400 |
| commit | 4e8f1ba242382c4f5535571bbc19d8efbcfbd7d5 (patch) | |
| tree | 9fc377562acb30e970129983b886433b19cd1667 /activerecord/lib/active_record | |
| parent | 8632efd8db78060f78be9f76be8b6149de05734e (diff) | |
| parent | b6ddaa4266c7d77fca9a61037c4455cfbf9d77a9 (diff) | |
| download | rails-4e8f1ba242382c4f5535571bbc19d8efbcfbd7d5.tar.gz rails-4e8f1ba242382c4f5535571bbc19d8efbcfbd7d5.tar.bz2 rails-4e8f1ba242382c4f5535571bbc19d8efbcfbd7d5.zip | |
Merge pull request #26451 from kamipo/remove_target_uniq_size
Remove unnecessary `target.uniq.size` in `CollectionAssociation#size`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 9230225c9d..f8aac895d7 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -219,11 +219,7 @@ module ActiveRecord # +count_records+, which is a method descendants have to provide. def size if !find_target? || loaded? - if association_scope.distinct_value - target.uniq.size - else - target.size - end + target.size elsif !association_scope.group_values.empty? load_target.size elsif !association_scope.distinct_value && target.is_a?(Array) |