diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-19 10:27:12 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-19 10:27:12 +0100 |
| commit | a48f893cbad096f7a4df1323a90d2f052ee2d2e0 (patch) | |
| tree | 6317ebae243f4b659c7faace00cd934b16dd48eb /activerecord/lib/active_record | |
| parent | bb4c63c70368c6f0189bf1f380ef66c07d7de40d (diff) | |
| parent | 0e835960c78f81bf0a78463d4bee2915a9b75de3 (diff) | |
| download | rails-a48f893cbad096f7a4df1323a90d2f052ee2d2e0.tar.gz rails-a48f893cbad096f7a4df1323a90d2f052ee2d2e0.tar.bz2 rails-a48f893cbad096f7a4df1323a90d2f052ee2d2e0.zip | |
Merge pull request #23114 from y-yagi/refer_to_rails_command_instead_of_rake_in_environment_error
refer to rails command instead of rake in environment error
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index f5b29c7f2e..4419a7b1e7 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -145,7 +145,7 @@ module ActiveRecord class NoEnvironmentInSchemaError < MigrationError #:nodoc: def initialize - msg = "Environment data not found in the schema. To resolve this issue, run: \n\n\tbin/rake db:environment:set" + msg = "Environment data not found in the schema. To resolve this issue, run: \n\n\tbin/rails db:environment:set" if defined?(Rails.env) super("#{msg} RAILS_ENV=#{::Rails.env}") else @@ -168,7 +168,7 @@ module ActiveRecord msg = "You are attempting to modify a database that was last run in `#{ stored }` environment.\n" msg << "You are running in `#{ current }` environment." msg << "If you are sure you want to continue, first set the environment using:\n\n" - msg << "\tbin/rake db:environment:set" + msg << "\tbin/rails db:environment:set" if defined?(Rails.env) super("#{msg} RAILS_ENV=#{::Rails.env}") else |