@@ -2198,7 +2198,7 @@ module ActiveRecord protected def aliased_table_name_for(name, suffix = nil) - if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+#{name.downcase}\son} + 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} @join_dependency.table_aliases[name] += 1 end activerecord/lib/active_record/associations.rb @@ -160,9 +160,9 @@ module ActiveRecord end "INNER JOIN %s ON %s.%s = %s.%s %s #{@reflection.options[:joins]} #{custom_joins}" % [ - @reflection.through_reflection.table_name, - @reflection.table_name, reflection_primary_key, - @reflection.through_reflection.table_name, source_primary_key, + @reflection.through_reflection.quoted_table_name, + @reflection.quoted_table_name, reflection_primary_key, + @reflection.through_reflection.quoted_table_name, source_primary_key, polymorphic_join ] end activerecord/lib/active_record/associations/has_many_through_association.rb @@ -204,6 +204,10 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase assert_equal 2, people(:michael).posts.count(:include => :readers) end + def test_inner_join_with_quoted_table_name + assert_equal 2, people(:michael).jobs.size + end + def test_get_ids assert_equal [posts(:welcome).id, posts(:authorless).id].sort, people(:michael).post_ids.sort end activerecord/test/cases/associations/has_many_through_associations_test.rb c092dbef50ba207174a94b7e0beb7782a3d86649 Karthik Krishnan info@karthiks.in http://github.com/rails/rails/commit/75a133f92ff7e27b83032babf829d8a58803bb3c 75a133f92ff7e27b83032babf829d8a58803bb3c 2008-12-20T13:08:51-08:00 2008-12-20T12:52:48-08:00 Fix has many through not quoting table names [#1163 state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> b6d68bff1f29febd1eb3b91987d6aaff9a4963fc Pratik Naik pratiknaik@gmail.com