@@ -179,12 +179,15 @@ namespace :db do end namespace :fixtures do - desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y" + desc "Load fixtures into the current environment's database. Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z." task :load => :environment do require 'active_record/fixtures' - ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| - Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) + ActiveRecord::Base.establish_connection(Rails.env) + base_dir = File.join(Rails.root, 'test', 'fixtures') + fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir + + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file| + Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*')) end end railties/lib/tasks/databases.rake 9783e66cade4d145389cca18fab822f44d03161a Jacek Becela jacek.becela@gmail.com http://github.com/rails/rails/commit/697ee1a50dea7580a7240535d3ad89d2d090721a 697ee1a50dea7580a7240535d3ad89d2d090721a 2008-07-13T17:32:01-07:00 2008-07-09T12:34:04-07:00 Enable loading fixtures from arbitrary locations. [#586 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 154cce607d90477b6e901b8977c75ce8107cd952 Pratik Naik pratiknaik@gmail.com