diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-20 07:19:02 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-10-20 07:19:02 -0700 |
| commit | c869ce02265299994df4c2333228d1be7538a665 (patch) | |
| tree | 7c1becc6b419b7fefd3404396b260c9ad8583300 /activerecord/lib | |
| parent | bfc6c17a87792012443e7b083e3e86810173c113 (diff) | |
| parent | 5042edabcf22be4026f19a451e682d02f7c1bec2 (diff) | |
| download | rails-c869ce02265299994df4c2333228d1be7538a665.tar.gz rails-c869ce02265299994df4c2333228d1be7538a665.tar.bz2 rails-c869ce02265299994df4c2333228d1be7538a665.zip | |
Merge pull request #7951 from Grandrath/patch-1
Use `Rails.env` instead of `ENV['RAILS_ENV']`.
Fix behavior of `rake db:structure:load`.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 69a9526fcc..0a9caa25b2 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -307,7 +307,7 @@ db_namespace = namespace :db do # desc "Recreate the databases from the structure.sql file" task :load => [:environment, :load_config] do - current_config = ActiveRecord::Tasks::DatabaseTasks.current_config(:env => (ENV['RAILS_ENV'] || 'test')) + current_config = ActiveRecord::Tasks::DatabaseTasks.current_config filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql") case current_config['adapter'] when /mysql/, /postgresql/, /sqlite/ |