From af3cf61aa7e139b8e8b446b65494f14cfcc538ce Mon Sep 17 00:00:00 2001 From: Jim Jones Date: Thu, 17 Jul 2014 21:19:07 -0700 Subject: Added additional help messaging when there's scaffolding being generated and a migration already exists for the resource. The user is now alerted that they are able to skip the conflicted migration file via the --skip option. --- railties/lib/rails/generators/actions/create_migration.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/generators/actions') diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb index cf3b7acfff..b4701b9591 100644 --- a/railties/lib/rails/generators/actions/create_migration.rb +++ b/railties/lib/rails/generators/actions/create_migration.rb @@ -55,7 +55,8 @@ module Rails else say_status :conflict, :red raise Error, "Another migration is already named #{migration_file_name}: " + - "#{existing_migration}. Use --force to replace this migration file." + "#{existing_migration}. Use --force to replace this migration" + + " or --skip to ignore conflicted file." end end -- cgit v1.2.3 From cc1ad787af462e03be5ff1805c3d176569cc1e2f Mon Sep 17 00:00:00 2001 From: Jim Jones Date: Fri, 18 Jul 2014 08:51:36 -0700 Subject: Modified migration conflict message to remove the string concatenation. --- railties/lib/rails/generators/actions/create_migration.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails/generators/actions') diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb index b4701b9591..71779b0a9c 100644 --- a/railties/lib/rails/generators/actions/create_migration.rb +++ b/railties/lib/rails/generators/actions/create_migration.rb @@ -54,9 +54,9 @@ module Rails say_status :skip, :yellow else say_status :conflict, :red - raise Error, "Another migration is already named #{migration_file_name}: " + - "#{existing_migration}. Use --force to replace this migration" + - " or --skip to ignore conflicted file." + raise Error, "Another migration is already named #{migration_file_name}: " \ + "#{existing_migration}. Use --force to replace this migration " \ + "or --skip to ignore conflicted file." end end -- cgit v1.2.3