diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 13:13:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 13:13:57 -0700 |
| commit | b6e061459b6a53959e26f94a750ccc9528116e05 (patch) | |
| tree | 0004df6bffc5c73d64ad89ba6f37b36c1f8d92fe /activerecord/lib | |
| parent | 259161881fb5becaadfca47bda2dcf36cfb129f2 (diff) | |
| parent | 2181832fca6171631f6c7ff700e14676c6d331e8 (diff) | |
| download | rails-b6e061459b6a53959e26f94a750ccc9528116e05.tar.gz rails-b6e061459b6a53959e26f94a750ccc9528116e05.tar.bz2 rails-b6e061459b6a53959e26f94a750ccc9528116e05.zip | |
Merge pull request #11226 from senny/remove_deprecated_distinct_option
Remove deprecated `:distinct` option from `Relation#count`.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index f2d28db923..68968e42a5 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -194,11 +194,6 @@ module ActiveRecord # If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count) distinct = self.distinct_value - if options.has_key?(:distinct) - ActiveSupport::Deprecation.warn "The :distinct option for `Relation#count` is deprecated. " \ - "Please use `Relation#distinct` instead. (eg. `relation.distinct.count`)" - distinct = options[:distinct] - end if operation == "count" if select_values.present? |