1 files changed, 18 insertions, 5 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index 1509e34473..c1f9d8962b 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -11,15 +11,28 @@ module ActiveRecord
       end
 
       protected
-        attr_reader :migration_action
+      attr_reader :migration_action, :join_tables
 
-        def set_local_assigns!
-          if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
-            @migration_action = $1
-            @table_name       = $2.pluralize
+      def set_local_assigns!
+        case file_name
+        when /^(add|remove)_.*_(?:to|from)_(.*)/
+          @migration_action = $1
+          @table_name       = $2.pluralize
+        when /join_table/
+          if attributes.length == 2
+            @migration_action = 'join'
+            @join_tables      = attributes.map(&:name)
+
+            set_index_names
           end
         end
+      end
 
+      def set_index_names
+        attributes.each_with_index do |attr, i|
+          attr.index_name = [attr, attributes[i - 1]].map{ |a| :"#{a.name.singularize}_id"}
+        end
+      end
     end
   end
 end