diff options
| author | Philippe Guay <Philippe.Guay@videri.com> | 2017-03-19 22:39:14 -0400 |
|---|---|---|
| committer | Philippe Guay <Philippe.Guay@videri.com> | 2017-03-26 21:06:02 -0400 |
| commit | 14739b5e27987e1eee080579fa0c80eea07347b8 (patch) | |
| tree | ab04a005f092325afaf6a15cf9ea72598cb161d5 /activerecord/lib/active_record/tasks/database_tasks.rb | |
| parent | 40ba03adaa743e2c67c82220794c9f11fae97d12 (diff) | |
| download | rails-14739b5e27987e1eee080579fa0c80eea07347b8.tar.gz rails-14739b5e27987e1eee080579fa0c80eea07347b8.tar.bz2 rails-14739b5e27987e1eee080579fa0c80eea07347b8.zip | |
Fixes #28359
Add stronger assertions to rake migration tasks to make sure the user is providing a numeric VERSION
An empty string was getting converted to version = 0. This would in turn pass the presence check.
Address linting warning
Add test for rake task and refactor code to meet expectations
In particular passing VERSION=0 should not raise an error.
Addressed Comments for PR #28485. Trimmed empty lines + change of wording for error message
Adjust test for change of wording in error message
Change condition to follow rails idioms
Diffstat (limited to 'activerecord/lib/active_record/tasks/database_tasks.rb')
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 82604a915f..46fa8a70a3 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -162,9 +162,11 @@ module ActiveRecord end def migrate + raise "Empty VERSION provided" if ENV["VERSION"] && ENV["VERSION"].empty? + verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil - scope = ENV["SCOPE"] + scope = ENV["SCOPE"] verbose_was, Migration.verbose = Migration.verbose, verbose Migrator.migrate(migrations_paths, version) do |migration| scope.blank? || scope == migration.scope |