diff options
| author | Viktar Basharymau <viktar.basharymau@thehamon.com> | 2014-06-25 12:29:32 +0300 |
|---|---|---|
| committer | Viktar Basharymau <viktar.basharymau@thehamon.com> | 2014-06-27 17:46:46 +0300 |
| commit | 8d541fc20282bb8cb2ab6a8762987c4e95bf2c51 (patch) | |
| tree | 07067ef19f94558d21014e288e967264e65c3092 /activerecord | |
| parent | 11ac0cad081eb418dfabe8a427332347beb12a0e (diff) | |
| download | rails-8d541fc20282bb8cb2ab6a8762987c4e95bf2c51.tar.gz rails-8d541fc20282bb8cb2ab6a8762987c4e95bf2c51.tar.bz2 rails-8d541fc20282bb8cb2ab6a8762987c4e95bf2c51.zip | |
Simplify complex code in databases.rake
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index ecf5afc4f4..5ffa09f1e1 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -190,7 +190,7 @@ db_namespace = namespace :db do require 'active_record/fixtures' base_dir = if ENV['FIXTURES_PATH'] - File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten + Rails.root.join(ENV['FIXTURES_PATH']) else ActiveRecord::Tasks::DatabaseTasks.fixtures_path end @@ -212,7 +212,7 @@ db_namespace = namespace :db do puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::FixtureSet.identify(label)}.) if label base_dir = if ENV['FIXTURES_PATH'] - File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten + Rails.root.join(ENV['FIXTURES_PATH']) else ActiveRecord::Tasks::DatabaseTasks.fixtures_path end |