diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-07 14:48:00 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-07 14:48:00 -0700 |
commit | 800604e4452dcc39849cbab087d96c3b7ca44e47 (patch) | |
tree | b9ae87c12d67ace4db7c77fe9762aee6ec4bca3f /activerecord/lib/active_record/railties/databases.rake | |
parent | 221211088bc2a0421dc641355017d3ba78b25cc5 (diff) | |
parent | bf4d6a235367a4704fd341711806c170aa234f80 (diff) | |
download | rails-800604e4452dcc39849cbab087d96c3b7ca44e47.tar.gz rails-800604e4452dcc39849cbab087d96c3b7ca44e47.tar.bz2 rails-800604e4452dcc39849cbab087d96c3b7ca44e47.zip |
Merge pull request #6282 from alexeymuranov/rename-fixtures-class
Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
Diffstat (limited to 'activerecord/lib/active_record/railties/databases.rake')
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index d134978128..69a9526fcc 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -196,7 +196,7 @@ db_namespace = namespace :db do fixtures_dir = File.join [base_dir, ENV['FIXTURES_DIR']].compact (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) + ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_file) end end @@ -207,13 +207,13 @@ db_namespace = namespace :db do label, id = ENV['LABEL'], ENV['ID'] raise 'LABEL or ID required' if label.blank? && id.blank? - puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::Fixtures.identify(label)}.) if label + puts %Q(The fixture ID for "#{label}" is #{ActiveRecord::FixtureSet.identify(label)}.) if label base_dir = ENV['FIXTURES_PATH'] ? File.join(Rails.root, ENV['FIXTURES_PATH']) : File.join(Rails.root, 'test', 'fixtures') Dir["#{base_dir}/**/*.yml"].each do |file| if data = YAML::load(ERB.new(IO.read(file)).result) data.keys.each do |key| - key_id = ActiveRecord::Fixtures.identify(key) + key_id = ActiveRecord::FixtureSet.identify(key) if key == label || key_id == id.to_i puts "#{file}: #{key} (#{key_id})" |