aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-11-14 17:17:46 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-11-15 13:42:50 -0800
commitca71bb8c99cb78fde6794cd2134b4b6147aa4426 (patch)
tree7deeb9d7e608ac23ab0ad9048ddd49e21d3f0df2 /activerecord
parentf77beac8a66a15b1e6f100e4134c79338ee9756b (diff)
downloadrails-ca71bb8c99cb78fde6794cd2134b4b6147aa4426.tar.gz
rails-ca71bb8c99cb78fde6794cd2134b4b6147aa4426.tar.bz2
rails-ca71bb8c99cb78fde6794cd2134b4b6147aa4426.zip
stop hardcoding FrontBase adapter conditionals
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 83cbbc1c1d..8054294954 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -280,7 +280,7 @@ module ActiveRecord
[aliaz, column_for(field)]
}
- group = @klass.connection.adapter_name == 'FrontBase' ? group_aliases : group_fields
+ group = group_fields
if operation == 'count' && column_name == :all
aggregate_alias = 'count_all'