From 11ac1e8a2ce9b12fce829088e1000328687d0cf4 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Sun, 23 Jun 2013 16:26:20 +0200 Subject: Setup env and seed_loaded for DatabaseTasks outside load_config Those vars can be used in tasks, which not call load_config. --- activerecord/lib/active_record/railtie.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 38b1fcb206..afb0be7b74 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -37,11 +37,12 @@ module ActiveRecord rake_tasks do require "active_record/base" + ActiveRecord::Tasks::DatabaseTasks.seed_loader = Rails.application + ActiveRecord::Tasks::DatabaseTasks.env = Rails.env + namespace :db do task :load_config do - ActiveRecord::Tasks::DatabaseTasks.env = Rails.env ActiveRecord::Tasks::DatabaseTasks.db_dir = Rails.application.config.paths["db"].first - ActiveRecord::Tasks::DatabaseTasks.seed_loader = Rails.application ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths['db/migrate'].to_a ActiveRecord::Tasks::DatabaseTasks.fixtures_path = File.join Rails.root, 'test', 'fixtures' -- cgit v1.2.3