diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-11-28 23:34:09 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-11-28 23:34:09 +0000 |
| commit | 191dfe8c6df0f72b5a9abaea0f754177f48859dc (patch) | |
| tree | 13e3bb3be1c16cdb0cd4bfdee9d60410d6adc126 | |
| parent | b44720452c4717d13b401ce9d386be9e1a4cc25c (diff) | |
| download | rails-191dfe8c6df0f72b5a9abaea0f754177f48859dc.tar.gz rails-191dfe8c6df0f72b5a9abaea0f754177f48859dc.tar.bz2 rails-191dfe8c6df0f72b5a9abaea0f754177f48859dc.zip | |
Make load_fixtures include csv fixtures. Closes #3053.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 719148791c..e3eea53352 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make load_fixtures include csv fixtures. #3053. [me@mdaines.com] + * Fix freeze_gems so that the latest rails version is dumped by default. [Nicholas Seckar] * script/plugin: handle root paths and plugin names which contain spaces. #2995 [justin@aspect.net] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 7f7d9d02a2..83140b1164 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -8,7 +8,7 @@ desc "Load fixtures into the current environment's database" task :load_fixtures => :environment do require 'active_record/fixtures' ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) - Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.yml')).each do |fixture_file| + Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}')).each do |fixture_file| Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*')) end end |