0
@@ -2198,7 +2198,7 @@ module ActiveRecord
0
             protected
0
 
0
               def aliased_table_name_for(name, suffix = nil)
0
-                if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{name.downcase}\son}
0
+                if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{active_record.connection.quote_table_name name.downcase}\son}
0
                   @join_dependency.table_aliases[name] += 1
0
                 end
0
 

0
@@ -160,9 +160,9 @@ module ActiveRecord
0
           end
0
 
0
           "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [
0
-            @reflection.through_reflection.table_name,
0
-            @reflection.table_name, reflection_primary_key,
0
-            @reflection.through_reflection.table_name, source_primary_key,
0
+            @reflection.through_reflection.quoted_table_name,
0
+            @reflection.quoted_table_name, reflection_primary_key,
0
+            @reflection.through_reflection.quoted_table_name, source_primary_key,
0
             polymorphic_join
0
           ]
0
         end

0
@@ -204,6 +204,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
0
     assert_equal 2, people(:michael).posts.count(:include => :readers)
0
   end
0
 
0
+  def test_inner_join_with_quoted_table_name
0
+    assert_equal 2, people(:michael).jobs.size
0
+  end
0
+
0
   def test_get_ids
0
     assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort
0
   end