diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-21 00:34:38 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-21 00:34:38 -0700 |
| commit | 14b2cf6a0ae2bfd60efb7c3146145bf005853cc3 (patch) | |
| tree | 175d81b85669e8eb0639880f357855aba4685036 | |
| parent | 2884567e55c6a00ae6b744599f6c57fb60e6051b (diff) | |
| parent | c63306b1a837de370abf905fced2ad5518c43c6f (diff) | |
| download | rails-14b2cf6a0ae2bfd60efb7c3146145bf005853cc3.tar.gz rails-14b2cf6a0ae2bfd60efb7c3146145bf005853cc3.tar.bz2 rails-14b2cf6a0ae2bfd60efb7c3146145bf005853cc3.zip | |
Merge pull request #5532 from mhfs/migration_blank_line
Remove blank line from generated migration
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/migration/templates/migration.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/migration_generator_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb index 43fa956c85..85f0d43b77 100644 --- a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb +++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb @@ -5,7 +5,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %> <%- if attribute.has_index? -%> add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %> - <%- end %> + <%- end -%> <%- end -%> end <%- else -%> diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index fd84164340..ad54f321a5 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -37,6 +37,7 @@ class MigrationGeneratorTest < Rails::Generators::TestCase assert_method :change, content do |up| assert_match(/add_column :posts, :title, :string/, up) assert_match(/add_column :posts, :body, :text/, up) + assert_no_match(/\n\n/, up) end end end |