kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Ensure calculations respect scoped :select [#1334 state:resolved]

Browse source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
stopdropandrew 2009-03-07 15:26:56 +00:00 committed by Pratik Naik
parent ccb0a92fa2
commit 6543426c73
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
activerecord/lib/active_record/calculations.rb
View file

@ -141,22 +141,30 @@ module ActiveRecord
def construct_count_options_from_args(*args)
options = {}
column_name = :all
# We need to handle
# count()
# count(:column_name=:all)
# count(options={})
# count(column_name=:all, options={})
# selects specified by scopes
case args.size
when 0
column_name = scope(:find)[:select] if scope(:find)
when 1
args[0].is_a?(Hash) ? options = args[0] : column_name = args[0]
if args[0].is_a?(Hash)
column_name = scope(:find)[:select] if scope(:find)
options = args[0]
else
column_name = args[0]
end
when 2
column_name, options = args
else
raise ArgumentError, "Unexpected parameters passed to count(): #{args.inspect}"
end if args.size > 0
[column_name, options]
end
[column_name || :all, options]
end
def construct_calculation_sql(operation, column_name, options) #:nodoc:

11
activerecord/test/cases/calculations_test.rb
View file

@ -264,6 +264,17 @@ class CalculationsTest < ActiveRecord::TestCase
assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit)
end
def test_should_count_scoped_select
Account.update_all("credit_limit = 50")
assert_equal 1, Account.scoped(:select => "DISTINCT credit_limit").count
end
def test_should_count_scoped_select_with_options
Account.update_all("credit_limit = 50")
Account.first.update_attribute('credit_limit', 49)
assert_equal 1, Account.scoped(:select => "DISTINCT credit_limit").count(:conditions => [ 'credit_limit >= 50'] )
end
def test_should_count_manual_select_with_include
assert_equal 6, Account.count(:select => "DISTINCT accounts.id", :include => :firm)
end