Merge branch 'master' into custom-discarded-job-handling

1 files changed, 267 insertions, 134 deletions

diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index b0d51eb22e..788f9160d6 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -15,69 +15,146 @@ module ApplicationTests
       end
 
       test "running migrations with given scope" do
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "model", "user", "username:string", "password:string"
 
-          app_file "db/migrate/01_a_migration.bukkits.rb", <<-MIGRATION
-            class AMigration < ActiveRecord::Migration::Current
-            end
-          MIGRATION
+        app_file "db/migrate/01_a_migration.bukkits.rb", <<-MIGRATION
+          class AMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          output = rails("db:migrate", "SCOPE=bukkits")
-          assert_no_match(/create_table\(:users\)/, output)
-          assert_no_match(/CreateUsers/, output)
-          assert_no_match(/add_column\(:users, :email, :string\)/, output)
+        output = rails("db:migrate", "SCOPE=bukkits")
+        assert_no_match(/create_table\(:users\)/, output)
+        assert_no_match(/CreateUsers/, output)
+        assert_no_match(/add_column\(:users, :email, :string\)/, output)
 
-          assert_match(/AMigration: migrated/, output)
+        assert_match(/AMigration: migrated/, output)
 
-          output = rails("db:migrate", "SCOPE=bukkits", "VERSION=0")
-          assert_no_match(/drop_table\(:users\)/, output)
-          assert_no_match(/CreateUsers/, output)
-          assert_no_match(/remove_column\(:users, :email\)/, output)
+        output = rails("db:migrate", "SCOPE=bukkits", "VERSION=0")
+        assert_no_match(/drop_table\(:users\)/, output)
+        assert_no_match(/CreateUsers/, output)
+        assert_no_match(/remove_column\(:users, :email\)/, output)
 
-          assert_match(/AMigration: reverted/, output)
-        end
+        assert_match(/AMigration: reverted/, output)
+      end
+
+      test "migrate with specified VERSION in different formats" do
+        app_file "db/migrate/01_one_migration.rb", <<-MIGRATION
+          class OneMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
+          class TwoMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        app_file "db/migrate/03_three_migration.rb", <<-MIGRATION
+          class ThreeMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        rails "db:migrate"
+
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
+        assert_match(/up\s+003\s+Three migration/, output)
+
+        rails "db:migrate", "VERSION=01_one_migration.rb"
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/down\s+002\s+Two migration/, output)
+        assert_match(/down\s+003\s+Three migration/, output)
+
+        rails "db:migrate", "VERSION=3"
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
+        assert_match(/up\s+003\s+Three migration/, output)
+
+        rails "db:migrate", "VERSION=001"
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/down\s+002\s+Two migration/, output)
+        assert_match(/down\s+003\s+Three migration/, output)
       end
 
       test "migration with empty version" do
-        Dir.chdir(app_path) do
-          output = rails("db:migrate", "VERSION=", allow_failure: true)
-          assert_match(/Empty VERSION provided/, output)
+        app_file "db/migrate/01_one_migration.rb", <<-MIGRATION
+          class OneMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          output = rails("db:migrate:redo", "VERSION=", allow_failure: true)
-          assert_match(/Empty VERSION provided/, output)
+        app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
+          class TwoMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          output = rails("db:migrate:up", "VERSION=", allow_failure: true)
-          assert_match(/VERSION is required/, output)
+        rails("db:migrate", "VERSION=")
 
-          output = rails("db:migrate:up", allow_failure: true)
-          assert_match(/VERSION is required/, output)
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
 
-          output = rails("db:migrate:down", "VERSION=", allow_failure: true)
-          assert_match(/VERSION is required - To go down one migration, use db:rollback/, output)
+        output = rails("db:migrate:redo", "VERSION=", allow_failure: true)
+        assert_match(/Empty VERSION provided/, output)
 
-          output = rails("db:migrate:down", allow_failure: true)
-          assert_match(/VERSION is required - To go down one migration, use db:rollback/, output)
-        end
+        output = rails("db:migrate:up", "VERSION=", allow_failure: true)
+        assert_match(/VERSION is required/, output)
+
+        output = rails("db:migrate:up", allow_failure: true)
+        assert_match(/VERSION is required/, output)
+
+        output = rails("db:migrate:down", "VERSION=", allow_failure: true)
+        assert_match(/VERSION is required - To go down one migration, use db:rollback/, output)
+
+        output = rails("db:migrate:down", allow_failure: true)
+        assert_match(/VERSION is required - To go down one migration, use db:rollback/, output)
+
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
       end
 
-      test "model and migration generator with change syntax" do
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
+      test "migration with 0 version" do
+        app_file "db/migrate/01_one_migration.rb", <<-MIGRATION
+          class OneMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          output = rails("db:migrate")
-          assert_match(/create_table\(:users\)/, output)
-          assert_match(/CreateUsers: migrated/, output)
-          assert_match(/add_column\(:users, :email, :string\)/, output)
-          assert_match(/AddEmailToUsers: migrated/, output)
-
-          output = rails("db:rollback", "STEP=2")
-          assert_match(/drop_table\(:users\)/, output)
-          assert_match(/CreateUsers: reverted/, output)
-          assert_match(/remove_column\(:users, :email, :string\)/, output)
-          assert_match(/AddEmailToUsers: reverted/, output)
-        end
+        app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
+          class TwoMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        rails "db:migrate"
+
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
+
+        rails "db:migrate", "VERSION=0"
+
+        output = rails("db:migrate:status")
+        assert_match(/down\s+001\s+One migration/, output)
+        assert_match(/down\s+002\s+Two migration/, output)
+      end
+
+      test "model and migration generator with change syntax" do
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+
+        output = rails("db:migrate")
+        assert_match(/create_table\(:users\)/, output)
+        assert_match(/CreateUsers: migrated/, output)
+        assert_match(/add_column\(:users, :email, :string\)/, output)
+        assert_match(/AddEmailToUsers: migrated/, output)
+
+        output = rails("db:rollback", "STEP=2")
+        assert_match(/drop_table\(:users\)/, output)
+        assert_match(/CreateUsers: reverted/, output)
+        assert_match(/remove_column\(:users, :email, :string\)/, output)
+        assert_match(/AddEmailToUsers: reverted/, output)
       end
 
       test "migration status when schema migrations table is not present" do
@@ -86,93 +163,85 @@ module ApplicationTests
       end
 
       test "migration status" do
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
-          rails "db:migrate"
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+        rails "db:migrate"
 
-          output = rails("db:migrate:status")
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/up\s+\d{14}\s+Add email to users/, output)
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-          rails "db:rollback", "STEP=1"
-          output = rails("db:migrate:status")
+        rails "db:rollback", "STEP=1"
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/down\s+\d{14}\s+Add email to users/, output)
-        end
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/down\s+\d{14}\s+Add email to users/, output)
       end
 
       test "migration status without timestamps" do
         add_to_config("config.active_record.timestamped_migrations = false")
 
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
-          rails "db:migrate"
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+        rails "db:migrate"
 
-          output = rails("db:migrate:status")
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{3,}\s+Create users/, output)
-          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+        assert_match(/up\s+\d{3,}\s+Create users/, output)
+        assert_match(/up\s+\d{3,}\s+Add email to users/, output)
 
-          rails "db:rollback", "STEP=1"
-          output = rails("db:migrate:status")
+        rails "db:rollback", "STEP=1"
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{3,}\s+Create users/, output)
-          assert_match(/down\s+\d{3,}\s+Add email to users/, output)
-        end
+        assert_match(/up\s+\d{3,}\s+Create users/, output)
+        assert_match(/down\s+\d{3,}\s+Add email to users/, output)
       end
 
       test "migration status after rollback and redo" do
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
-          rails "db:migrate"
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+        rails "db:migrate"
 
-          output = rails("db:migrate:status")
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/up\s+\d{14}\s+Add email to users/, output)
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-          rails "db:rollback", "STEP=2"
-          output = rails("db:migrate:status")
+        rails "db:rollback", "STEP=2"
+        output = rails("db:migrate:status")
 
-          assert_match(/down\s+\d{14}\s+Create users/, output)
-          assert_match(/down\s+\d{14}\s+Add email to users/, output)
+        assert_match(/down\s+\d{14}\s+Create users/, output)
+        assert_match(/down\s+\d{14}\s+Add email to users/, output)
 
-          rails "db:migrate:redo"
-          output = rails("db:migrate:status")
+        rails "db:migrate:redo"
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/up\s+\d{14}\s+Add email to users/, output)
-        end
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/up\s+\d{14}\s+Add email to users/, output)
       end
 
       test "migration status after rollback and forward" do
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
-          rails "db:migrate"
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+        rails "db:migrate"
 
-          output = rails("db:migrate:status")
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/up\s+\d{14}\s+Add email to users/, output)
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-          rails "db:rollback", "STEP=2"
-          output = rails("db:migrate:status")
+        rails "db:rollback", "STEP=2"
+        output = rails("db:migrate:status")
 
-          assert_match(/down\s+\d{14}\s+Create users/, output)
-          assert_match(/down\s+\d{14}\s+Add email to users/, output)
+        assert_match(/down\s+\d{14}\s+Create users/, output)
+        assert_match(/down\s+\d{14}\s+Add email to users/, output)
 
-          rails "db:forward", "STEP=2"
-          output = rails("db:migrate:status")
+        rails "db:forward", "STEP=2"
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{14}\s+Create users/, output)
-          assert_match(/up\s+\d{14}\s+Add email to users/, output)
-        end
+        assert_match(/up\s+\d{14}\s+Create users/, output)
+        assert_match(/up\s+\d{14}\s+Add email to users/, output)
       end
 
       test "raise error on any move when current migration does not exist" do
@@ -206,53 +275,117 @@ module ApplicationTests
         end
       end
 
+      test "raise error on any move when target migration does not exist" do
+        app_file "db/migrate/01_one_migration.rb", <<-MIGRATION
+          class OneMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
+          class TwoMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
+
+        rails "db:migrate"
+
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
+
+        output = rails("db:migrate", "VERSION=3", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/ActiveRecord::UnknownMigrationVersionError:/, output)
+        assert_match(/No migration with version number 3/, output)
+
+        output = rails("db:migrate:status")
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
+      end
+
+      test "raise error on any move when VERSION has invalid format" do
+        output = rails("db:migrate", "VERSION=unknown", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION=0.1.11", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION=1.1.11", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION='0 '", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION=1.", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION=1_", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate", "VERSION=1_name", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate:redo", "VERSION=unknown", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate:up", "VERSION=unknown", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+
+        output = rails("db:migrate:down", "VERSION=unknown", allow_failure: true)
+        assert_match(/rails aborted!/, output)
+        assert_match(/Invalid format of target version/, output)
+      end
+
       test "migration status after rollback and redo without timestamps" do
         add_to_config("config.active_record.timestamped_migrations = false")
 
-        Dir.chdir(app_path) do
-          rails "generate", "model", "user", "username:string", "password:string"
-          rails "generate", "migration", "add_email_to_users", "email:string"
-          rails "db:migrate"
+        rails "generate", "model", "user", "username:string", "password:string"
+        rails "generate", "migration", "add_email_to_users", "email:string"
+        rails "db:migrate"
 
-          output = rails("db:migrate:status")
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{3,}\s+Create users/, output)
-          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+        assert_match(/up\s+\d{3,}\s+Create users/, output)
+        assert_match(/up\s+\d{3,}\s+Add email to users/, output)
 
-          rails "db:rollback", "STEP=2"
-          output = rails("db:migrate:status")
+        rails "db:rollback", "STEP=2"
+        output = rails("db:migrate:status")
 
-          assert_match(/down\s+\d{3,}\s+Create users/, output)
-          assert_match(/down\s+\d{3,}\s+Add email to users/, output)
+        assert_match(/down\s+\d{3,}\s+Create users/, output)
+        assert_match(/down\s+\d{3,}\s+Add email to users/, output)
 
-          rails "db:migrate:redo"
-          output = rails("db:migrate:status")
+        rails "db:migrate:redo"
+        output = rails("db:migrate:status")
 
-          assert_match(/up\s+\d{3,}\s+Create users/, output)
-          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
-        end
+        assert_match(/up\s+\d{3,}\s+Create users/, output)
+        assert_match(/up\s+\d{3,}\s+Add email to users/, output)
       end
 
       test "running migrations with not timestamp head migration files" do
-        Dir.chdir(app_path) do
+        app_file "db/migrate/1_one_migration.rb", <<-MIGRATION
+          class OneMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          app_file "db/migrate/1_one_migration.rb", <<-MIGRATION
-            class OneMigration < ActiveRecord::Migration::Current
-            end
-          MIGRATION
+        app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
+          class TwoMigration < ActiveRecord::Migration::Current
+          end
+        MIGRATION
 
-          app_file "db/migrate/02_two_migration.rb", <<-MIGRATION
-            class TwoMigration < ActiveRecord::Migration::Current
-            end
-          MIGRATION
+        rails "db:migrate"
 
-          rails "db:migrate"
+        output = rails("db:migrate:status")
 
-          output = rails("db:migrate:status")
-
-          assert_match(/up\s+001\s+One migration/, output)
-          assert_match(/up\s+002\s+Two migration/, output)
-        end
+        assert_match(/up\s+001\s+One migration/, output)
+        assert_match(/up\s+002\s+Two migration/, output)
       end
 
       test "schema generation when dump_schema_after_migration is set" do