diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-16 10:49:20 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-16 10:49:20 -0700 |
| commit | 7381968c08a1a6a6c6f5bf02ac461b1cc63778f2 (patch) | |
| tree | 7a1af13b8211b328338baf4e392e378e22776d90 /activerecord/lib | |
| parent | bebfa5c62b6795997bf0ee8830d64e665bc1245b (diff) | |
| parent | ee64abbf948b489ee1b3b0a3fae378b974a3db87 (diff) | |
| download | rails-7381968c08a1a6a6c6f5bf02ac461b1cc63778f2.tar.gz rails-7381968c08a1a6a6c6f5bf02ac461b1cc63778f2.tar.bz2 rails-7381968c08a1a6a6c6f5bf02ac461b1cc63778f2.zip | |
Merge pull request #6755 from kennyj/remove_csv_support
Don't read csv file during executing db:fixtures:load.
Diffstat (limited to 'activerecord/lib')
| -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 d8d4834d22..a1ff93f08b 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -318,7 +318,7 @@ db_namespace = namespace :db do 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| + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir["#{fixtures_dir}/**/*.yml"].map {|f| f[(fixtures_dir.size + 1)..-5] }).each do |fixture_file| ActiveRecord::Fixtures.create_fixtures(fixtures_dir, fixture_file) end end |