From 8d541fc20282bb8cb2ab6a8762987c4e95bf2c51 Mon Sep 17 00:00:00 2001 From: Viktar Basharymau Date: Wed, 25 Jun 2014 12:29:32 +0300 Subject: Simplify complex code in databases.rake --- activerecord/lib/active_record/railties/databases.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/railties/databases.rake') 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 -- cgit v1.2.3