diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-11-06 21:58:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-06 21:58:14 -0500 |
commit | 212481b490bcd5db77aae1a0a338e25eedc98471 (patch) | |
tree | bd09f73f4fa49ae4239023478caf37ac18d645cd /activerecord/lib/active_record/railties | |
parent | 86938c495e282e6a61c16a9e1d77582e22c0a4fc (diff) | |
parent | 90fe2a42f0b68a66e970169d38e91a0126de7d3e (diff) | |
download | rails-212481b490bcd5db77aae1a0a338e25eedc98471.tar.gz rails-212481b490bcd5db77aae1a0a338e25eedc98471.tar.bz2 rails-212481b490bcd5db77aae1a0a338e25eedc98471.zip |
Merge pull request #30714 from bogdanvlviv/fix-rails_db_migrate_VERSION
Fix `bin/rails db:migrate` with specified `VERSION`
Diffstat (limited to 'activerecord/lib/active_record/railties')
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 723272b4b2..3bca2982e0 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -97,16 +97,27 @@ db_namespace = namespace :db do task up: [:environment, :load_config] do raise "VERSION is required" if !ENV["VERSION"] || ENV["VERSION"].empty? - version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil - ActiveRecord::Migrator.run(:up, ActiveRecord::Tasks::DatabaseTasks.migrations_paths, version) + ActiveRecord::Tasks::DatabaseTasks.check_target_version + + ActiveRecord::Migrator.run( + :up, + ActiveRecord::Tasks::DatabaseTasks.migrations_paths, + ActiveRecord::Tasks::DatabaseTasks.target_version + ) db_namespace["_dump"].invoke end # desc 'Runs the "down" for a given migration VERSION.' task down: [:environment, :load_config] do raise "VERSION is required - To go down one migration, use db:rollback" if !ENV["VERSION"] || ENV["VERSION"].empty? - version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil - ActiveRecord::Migrator.run(:down, ActiveRecord::Tasks::DatabaseTasks.migrations_paths, version) + + ActiveRecord::Tasks::DatabaseTasks.check_target_version + + ActiveRecord::Migrator.run( + :down, + ActiveRecord::Tasks::DatabaseTasks.migrations_paths, + ActiveRecord::Tasks::DatabaseTasks.target_version + ) db_namespace["_dump"].invoke end |