From 2181832fca6171631f6c7ff700e14676c6d331e8 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 1 Jul 2013 22:11:20 +0200 Subject: Remove deprecated `:distinct` option from `Relation#count`. --- activerecord/lib/active_record/relation/calculations.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'activerecord/lib') 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? -- cgit v1.2.3