1 files changed, 18 insertions, 3 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 5f1dbe36d6..7a3c6f5e95 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -8,24 +8,32 @@ module ActiveRecord
       def create_migration_file
         set_local_assigns!
         validate_file_name!
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+        migration_template @migration_template, "db/migrate/#{file_name}.rb"
       end
 
       protected
       attr_reader :migration_action, :join_tables
 
+      # sets the default migration template that is being used for the generation of the migration
+      # depending on the arguments which would be sent out in the command line, the migration template 
+      # and the table name instance variables are setup.
+
       def set_local_assigns!
+        @migration_template = "migration.rb"
         case file_name
         when /^(add|remove)_.*_(?:to|from)_(.*)/
           @migration_action = $1
-          @table_name       = $2.pluralize
+          @table_name       = normalize_table_name($2)
         when /join_table/
           if attributes.length == 2
             @migration_action = 'join'
-            @join_tables      = attributes.map(&:plural_name)
+            @join_tables      = pluralize_table_names? ? attributes.map(&:plural_name) : attributes.map(&:singular_name)
 
             set_index_names
           end
+        when /^create_(.+)/
+          @table_name = normalize_table_name($1)
+          @migration_template = "create_table_migration.rb"
         end
       end
 
@@ -44,12 +52,19 @@ module ActiveRecord
       end
 
       private
+        def attributes_with_index
+          attributes.select { |a| !a.reference? && a.has_index? }
+        end
 
         def validate_file_name!
           unless file_name =~ /^[_a-z0-9]+$/
             raise IllegalMigrationNameError.new(file_name)
           end
         end
+
+        def normalize_table_name(_table_name)
+          pluralize_table_names? ? _table_name.pluralize : _table_name.singularize
+        end
     end
   end
 end