0
@@ -186,11 +186,17 @@ module ActiveRecord
0
             sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround
0
             sql << " FROM #{connection.quote_table_name(table_name)} "
0
           end
0
+
0
+          joins = ""
0
+          add_joins!(joins, options, scope)
0
+
0
           if merged_includes.any?
0
-            join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, options[:joins])
0
+            join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(self, merged_includes, joins)
0
             sql << join_dependency.join_associations.collect{|join| join.association_join }.join
0
           end
0
-          add_joins!(sql, options, scope)
0
+
0
+          sql << joins unless joins.blank?
0
+
0
           add_conditions!(sql, options[:conditions], scope)
0
           add_limited_ids_condition!(sql, options, join_dependency) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
0
 

0
@@ -196,4 +196,8 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
0
     # due to Unknown column 'comments.id'
0
     assert Person.find(1).posts_with_comments_sorted_by_comment_id.find_by_title('Welcome to the weblog')
0
   end
0
+
0
+  def test_count_with_include_should_alias_join_table
0
+    assert_equal 2, people(:michael).posts.count(:include => :readers)
0
+  end
0
 end