From 7750afc4c1b6873bf1ee50ca386b9714430be618 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Thu, 13 Mar 2008 03:06:51 +0000 Subject: Ensure that ActiveRecord::Calculations disambiguates field names with the table name. Closes #11027 [cavalle] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9018 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/calculations.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index c8c8d42def..fc61a221a1 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -155,6 +155,7 @@ module ActiveRecord scope = scope(:find) merged_includes = merge_includes(scope ? scope[:include] : [], options[:include]) aggregate_alias = column_alias_for(operation, column_name) + column_name = "#{connection.quote_table_name(table_name)}.#{column_name}" unless column_name == "*" || column_name.to_s.include?('.') if operation == 'count' if merged_includes.any? -- cgit v1.2.3