diff options
| author | Jon Atack <jonnyatack@gmail.com> | 2015-07-03 11:11:59 +0200 |
|---|---|---|
| committer | Jon Atack <jonnyatack@gmail.com> | 2015-07-03 11:11:59 +0200 |
| commit | 64401610b50d1952f4d0c8976916aa789ccc43e3 (patch) | |
| tree | 95d06d13e0067676f8103830be90ebfaddc9eca2 /activerecord/lib/active_record | |
| parent | 626b10ef1f34fbc5595107e1cdbd3f839a46d96a (diff) | |
| download | rails-64401610b50d1952f4d0c8976916aa789ccc43e3.tar.gz rails-64401610b50d1952f4d0c8976916aa789ccc43e3.tar.bz2 rails-64401610b50d1952f4d0c8976916aa789ccc43e3.zip | |
[skip ci] #distinct instead of #uniq
as #uniq will be removed from Rails 5.0 as per the Active Support
exception raised:
ActiveSupport::DeprecationException: DEPRECATION WARNING: uniq is
deprecated and will be removed from Rails 5.0 (use distinct instead).
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index df72ba7e9c..0f6015fa93 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -139,7 +139,7 @@ module ActiveRecord # # SELECT people.id, people.name FROM people # # => [[1, 'David'], [2, 'Jeremy'], [3, 'Jose']] # - # Person.uniq.pluck(:role) + # Person.distinct.pluck(:role) # # SELECT DISTINCT role FROM people # # => ['admin', 'member', 'guest'] # @@ -195,7 +195,8 @@ module ActiveRecord def perform_calculation(operation, column_name) operation = operation.to_s.downcase - # If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count) + # If #count is used with #distinct (i.e. `relation.distinct.count`) it is + # considered distinct. distinct = self.distinct_value if operation == "count" |