diff options
Diffstat (limited to 'railties/lib/rails_generator')
3 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index de6fefe093..dd72436fc8 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -309,8 +309,9 @@ module Rails # When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template. def migration_template(relative_source, relative_destination, template_options = {}) migration_directory relative_destination - raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name) - template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options) + migration_file_name = template_options[:migration_file_name] || file_name + raise "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}" if migration_exists?(migration_file_name) + template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options) end private diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index a192c14e0d..b421c5df74 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -129,6 +129,9 @@ class AppGenerator < Rails::Generator::Base test/unit vendor vendor/plugins + tmp/sessions + tmp/sockets + tmp/cache ) MYSQL_SOCKET_LOCATIONS = [ diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb index 5e9aa882f3..9cadf863fb 100644 --- a/railties/lib/rails_generator/generators/components/model/model_generator.rb +++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb @@ -19,7 +19,7 @@ class ModelGenerator < Rails::Generator::NamedBase unless options[:skip_migration] m.migration_template 'migration.rb', 'db/migrate', :assigns => { :migration_name => "Add#{class_name.pluralize}" - } + }, :migration_file_name => "add_#{file_name.pluralize}" end end end |