diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-29 17:30:01 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-29 18:21:24 -0700 |
| commit | 2987115656dd3590e7034271aade26dc006cd158 (patch) | |
| tree | 09fb129a64d17de43f3623c6457a19fd819fb265 /activerecord | |
| parent | 1f5249bf937ec07ca644e500630e8c196394f252 (diff) | |
| download | rails-2987115656dd3590e7034271aade26dc006cd158.tar.gz rails-2987115656dd3590e7034271aade26dc006cd158.tar.bz2 rails-2987115656dd3590e7034271aade26dc006cd158.zip | |
make sure we flatten the fixture path list
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index fae88943ab..182b5c9210 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -301,7 +301,7 @@ db_namespace = namespace :db do require 'active_record/fixtures' ActiveRecord::Base.establish_connection(Rails.env) - base_dir = File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}] + base_dir = File.join [Rails.root, ENV['FIXTURES_PATH'] || %w{test fixtures}].flatten fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.{yml,csv}"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file| |