Permalink
Browse files

Ensure Arel columns are typecasted properly when grouping with calcul…

…ation

Fix build issue with postgresql.

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
  • Loading branch information...
1 parent 12ac977 commit f8f4ac91203506c94d547ee0ef530bd60faf97ed @carlosantoniodasilva carlosantoniodasilva committed Jun 25, 2012
@@ -295,10 +295,10 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
end
ActiveSupport::OrderedHash[calculated_data.map do |row|
- key = group_columns.map { |aliaz, column|
+ key = group_columns.map { |aliaz, column|
type_cast_calculated_value(row[aliaz], column)
}
- key = key.first if key.size == 1
+ key = key.first if key.size == 1
key = key_records[key] if associated
[key, type_cast_calculated_value(row[aggregate_alias], column_for(column_name), operation)]
end]
@@ -325,7 +325,7 @@ def column_alias_for(*keys)
end
def column_for(field)
- field_name = field.to_s.split('.').last
+ field_name = field.respond_to?(:name) ? field.name.to_s : field.to_s.split('.').last
@klass.columns.detect { |c| c.name.to_s == field_name }
end
@@ -64,12 +64,16 @@ def test_should_get_minimum_of_field
def test_should_group_by_field
c = Account.sum(:credit_limit, :group => :firm_id)
- [1,6,2].each { |firm_id| assert c.keys.include?(firm_id) }
+ [1,6,2].each do |firm_id|
+ assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+ end
end
def test_should_group_by_arel_attribute
c = Account.sum(:credit_limit, :group => Account.arel_table[:firm_id])
- [1,6,2].each { |firm_id| assert c.keys.include?(firm_id) }
+ [1,6,2].each do |firm_id|
+ assert c.keys.include?(firm_id), "Group #{c.inspect} does not contain firm_id #{firm_id}"
+ end
end
def test_should_group_by_multiple_fields

0 comments on commit f8f4ac9

Please sign in to comment.