Merge pull request #7716 from steveklabnik/issue_7715

Coerce strings in create_join_table.

2 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/migration/join_table.rb b/activerecord/lib/active_record/migration/join_table.rb
index e880ae97bb..ebf64cbcdc 100644
--- a/activerecord/lib/active_record/migration/join_table.rb
+++ b/activerecord/lib/active_record/migration/join_table.rb
@@ -8,7 +8,7 @@ module ActiveRecord
       end
 
       def join_table_name(table_1, table_2)
-        [table_1, table_2].sort.join("_").to_sym
+        [table_1.to_s, table_2.to_s].sort.join("_").to_sym
       end
     end
   end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index c155f29973..b77da39e29 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -755,4 +755,11 @@ class CopyMigrationsTest < ActiveRecord::TestCase
   ensure
     clear
   end
+
+  def test_create_join_table_with_symbol_and_string
+    connection.create_join_table :artists, 'musics'
+
+    assert_equal %w(artist_id music_id), connection.columns(:artists_musics).map(&:name).sort
+  end
+
 end