diff options
author | Tarmo Tänav <tarmo@itech.ee> | 2008-08-26 19:00:47 +0300 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-27 23:29:29 -0700 |
commit | 13671cc565aad2327f81a29789154b829ceeda04 (patch) | |
tree | 9fcca45f5d322423f71563f91b11dbfa84f01c92 /activerecord/lib/active_record/calculations.rb | |
parent | ad562c58eabfb8b44cb8ac9e87b87a7f998325fd (diff) | |
download | rails-13671cc565aad2327f81a29789154b829ceeda04.tar.gz rails-13671cc565aad2327f81a29789154b829ceeda04.tar.bz2 rails-13671cc565aad2327f81a29789154b829ceeda04.zip |
Alias included associations if needed when doing a count
[#302 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
-rw-r--r-- | activerecord/lib/active_record/calculations.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 77cc6da251..08306f361a 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -186,11 +186,17 @@ module ActiveRecord sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround sql << " FROM #{connection.quote_table_name(table_name)} " end + + joins = "" + add_joins!(joins, options, scope) + if merged_includes.any? - join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins]) + join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, joins) sql << join_dependency.join_associations.collect{|join| join.association_join }.join end - add_joins!(sql, options, scope) + + sql << joins unless joins.blank? + add_conditions!(sql, options[:conditions], scope) add_limited_ids_condition!(sql, options, join_dependency) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) |