aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAlexey Muranov <alexey.muranov@gmail.com>2011-12-31 19:03:16 +0100
committerAlexey Muranov <alexey.muranov@gmail.com>2012-05-09 11:25:19 +0200
commitaf44c2ba4a82cf21842071d7c7711de086768f2f (patch)
tree619460dd53d3690b26dbfe5c13c50e4b7d814097 /activerecord
parentf1cc45e56a4fc6e80bb4be4434dbf49d41adfd83 (diff)
downloadrails-af44c2ba4a82cf21842071d7c7711de086768f2f.tar.gz
rails-af44c2ba4a82cf21842071d7c7711de086768f2f.tar.bz2
rails-af44c2ba4a82cf21842071d7c7711de086768f2f.zip
Remove unused parameter in ::instantiate_fixtures
Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/fixtures.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index a01e2f74ff..a6995b8e96 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -411,7 +411,7 @@ module ActiveRecord
cache_for_connection(connection).update(fixtures_map)
end
- def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
+ def self.instantiate_fixtures(object, fixtures, load_instances = true)
if load_instances
fixtures.each do |name, fixture|
begin
@@ -424,8 +424,8 @@ module ActiveRecord
end
def self.instantiate_all_loaded_fixtures(object, load_instances = true)
- all_loaded_fixtures.each do |table_name, fixtures|
- ActiveRecord::Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+ all_loaded_fixtures.each_value do |fixtures|
+ instantiate_fixtures(object, fixtures, load_instances)
end
end
@@ -901,8 +901,8 @@ module ActiveRecord
ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
else
raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
- @loaded_fixtures.each do |fixture_name, fixtures|
- ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
+ @loaded_fixtures.each_value do |fixtures|
+ ActiveRecord::Fixtures.instantiate_fixtures(self, fixtures, load_instances?)
end
end
end