Permalink
Browse files

Fix bug where calculations with long alias names return null. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4269 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 09095c7 commit f106e2c5c809ca355ce68a3e15718a17cd930680 @technoweenie technoweenie committed Apr 25, 2006
Showing with 6 additions and 4 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +4 −4 activerecord/lib/active_record/calculations.rb
@@ -1,5 +1,7 @@
*SVN*
+* Fix bug where calculations with long alias names return null. [Rick]
+
* Raise error when trying to add to a has_many :through association. Use the Join Model instead. [Rick]
@post.tags << @tag # BAD
@@ -172,10 +172,10 @@ def construct_calculation_sql(operation, column_name, options) #:nodoc:
end
add_joins!(sql, options, scope)
add_conditions!(sql, options[:conditions], scope)
- sql << " GROUP BY #{options[:group_field]}" if options[:group]
- sql << " HAVING #{options[:having]}" if options[:group] && options[:having]
- sql << " ORDER BY #{options[:order]}" if options[:order]
add_limited_ids_condition!(sql, options, join_dependency) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
+ sql << " GROUP BY #{options[:group_field]} " if options[:group]
+ sql << " HAVING #{options[:having]} " if options[:group] && options[:having]
+ sql << " ORDER BY #{options[:order]} " if options[:order]
add_limit!(sql, options, scope)
sql << ')' if use_workaround
sql
@@ -222,7 +222,7 @@ def validate_calculation_options(operation, options = {})
# count(distinct users.id) #=> count_distinct_users_id
# count(*) #=> count_all
def column_alias_for(*keys)
- keys.join(' ').downcase.gsub(/\*/, 'all').gsub(/\W+/, ' ').strip.gsub(/ +/, '_')
+ connection.table_alias_for(keys.join(' ').downcase.gsub(/\*/, 'all').gsub(/\W+/, ' ').strip.gsub(/ +/, '_'))
end
def column_for(field)

0 comments on commit f106e2c

Please sign in to comment.