Permalink
Browse files

Simplify complex code in databases.rake

  • Loading branch information...
DNNX committed Jun 25, 2014
1 parent 11ac0ca commit 8d541fc20282bb8cb2ab6a8762987c4e95bf2c51
Showing with 2 additions and 2 deletions.
  1. +2 −2 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

0 comments on commit 8d541fc

Please sign in to comment.