1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index eb85acf37e..7be875fec6 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -37,6 +37,14 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
     assert_match(/agents_people_2/i, sql)
   end
 
+  def test_construct_finder_sql_does_not_table_name_collide_with_aliased_joins
+    people = Person.arel_table
+    agents = people.alias("agents_people")
+    constraint = agents[:primary_contact_id].eq(people[:id])
+    sql = Person.joins(:agents).joins(agents.create_join(agents, agents.create_on(constraint))).to_sql
+    assert_match(/agents_people_2/i, sql)
+  end
+
   def test_construct_finder_sql_ignores_empty_joins_hash
     sql = Author.joins({}).to_sql
     assert_no_match(/JOIN/i, sql)