Permalink
Browse files

Merge pull request #9078 from senny/6865_ar_count_with_uniq

`#count` in conjunction with `#uniq` performs distinct count.
  • Loading branch information...
2 parents 9df2584 + 648def4 commit 647d18c92c77b96754c7e9e3d9142f18e0772061 @rafaelfranca rafaelfranca committed Jan 26, 2013
@@ -1,5 +1,14 @@
## Rails 4.0.0 (unreleased) ##
+* When `#count` is used in conjunction with `#uniq` we perform `count(:distinct => true)`.
+ Fix #6865.
+
+ Example:
+
+ relation.uniq.count # => SELECT COUNT(DISTINCT *)
+
+ *Yves Senn + Kaspar Schiess*
+
* PostgreSQL ranges type support. Includes: int4range, int8range,
numrange, tsrange, tstzrange, daterange
@@ -192,7 +192,8 @@ def has_include?(column_name)
def perform_calculation(operation, column_name, options = {})
operation = operation.to_s.downcase
- distinct = options[:distinct]
+ # If #count is used in conjuction with #uniq it is considered distinct. (eg. relation.uniq.count)
+ distinct = options[:distinct] || self.uniq_value
if operation == "count"
column_name ||= (select_for_count || :all)
@@ -341,6 +341,10 @@ def test_count_with_column_parameter
assert_equal 5, Account.count(:firm_id)
end
+ def test_count_with_uniq
+ assert_equal 4, Account.select(:credit_limit).uniq.count
+ end
+
def test_count_with_column_and_options_parameter
assert_equal 2, Account.where("credit_limit = 50 AND firm_id IS NOT NULL").count(:firm_id)
end

0 comments on commit 647d18c

Please sign in to comment.