From 13ff102c8439c683fb34371a0672d7b48e110d1f Mon Sep 17 00:00:00 2001 From: Viktar Basharymau Date: Wed, 25 Jun 2014 12:34:21 +0300 Subject: db:fixtures:{identify,load} tasks respect AR::Tasks::DatabaseTasks.root Before this commit, if `ENV['FIXTURES_PATH']` was set, then `Rails.root` was used, otherwise the app used `ActiveRecord::Tasks::DatabaseTasks.root`. Now it is consistent. --- activerecord/lib/active_record/railties/databases.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/railties') diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 5ffa09f1e1..695ae2ae41 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'] - Rails.root.join(ENV['FIXTURES_PATH']) + ActiveRecord::Tasks::DatabaseTasks.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'] - Rails.root.join(ENV['FIXTURES_PATH']) + ActiveRecord::Tasks::DatabaseTasks.root.join(ENV['FIXTURES_PATH']) else ActiveRecord::Tasks::DatabaseTasks.fixtures_path end -- cgit v1.2.3