diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-17 09:30:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 09:30:21 +0200 |
| commit | a0ff5b57246f0b1439dc9b5ffbdd880e70fab93d (patch) | |
| tree | 0f1a4a21f89f25e7e6740a73c20893af1efdb8dc /railties/lib | |
| parent | 47eadb68bfcae1641b019e07e051aa39420685fb (diff) | |
| parent | 8be50181d3fbe0f727a68de33ec856efdf772487 (diff) | |
| download | rails-a0ff5b57246f0b1439dc9b5ffbdd880e70fab93d.tar.gz rails-a0ff5b57246f0b1439dc9b5ffbdd880e70fab93d.tar.bz2 rails-a0ff5b57246f0b1439dc9b5ffbdd880e70fab93d.zip | |
Merge pull request #29821 from y-yagi/set_rails_env_before_load_application_file
Set `RAILS_ENV` before load application file
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/commands/dbconsole/dbconsole_command.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb index a66eb16421..71b3455473 100644 --- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb +++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb @@ -11,7 +11,7 @@ module Rails end def start - ENV["RAILS_ENV"] = @options[:environment] || environment + ENV["RAILS_ENV"] ||= @options[:environment] || environment case config["adapter"] when /^(jdbc)?mysql/ @@ -157,6 +157,9 @@ module Rails def perform extract_environment_option_from_argument + # RAILS_ENV needs to be set before config/application is required. + ENV["RAILS_ENV"] = options[:environment] + require_application_and_environment! Rails::DBConsole.start(options) end |