aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-06-17 02:37:00 +0900
committerkennyj <kennyj@gmail.com>2012-06-17 02:42:53 +0900
commitee64abbf948b489ee1b3b0a3fae378b974a3db87 (patch)
tree7a1af13b8211b328338baf4e392e378e22776d90 /activerecord/lib
parentbebfa5c62b6795997bf0ee8830d64e665bc1245b (diff)
downloadrails-ee64abbf948b489ee1b3b0a3fae378b974a3db87.tar.gz
rails-ee64abbf948b489ee1b3b0a3fae378b974a3db87.tar.bz2
rails-ee64abbf948b489ee1b3b0a3fae378b974a3db87.zip
Don't read csv file during executing db:fixtures:load.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake2
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