aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorErik Michaels-Ober <sferik@gmail.com>2014-09-29 16:07:18 +0200
committerErik Michaels-Ober <sferik@gmail.com>2014-09-29 17:27:10 +0200
commite2b49b203f2cb6cef93283f14838f21bf6ffb4a2 (patch)
tree14d3101aca1464d140a824e6c859cecef425bfc8 /activerecord
parent3b451fc0fd4a507016b5a6fe61bb4a8ae388c099 (diff)
downloadrails-e2b49b203f2cb6cef93283f14838f21bf6ffb4a2.tar.gz
rails-e2b49b203f2cb6cef93283f14838f21bf6ffb4a2.tar.bz2
rails-e2b49b203f2cb6cef93283f14838f21bf6ffb4a2.zip
Use Hash#each_key instead of Hash#keys.each
Hash#keys.each allocates an array of keys; Hash#each_key iterates through the keys without allocating a new array. This is the reason why Hash#each_key exists.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/fixtures.rb2
-rw-r--r--activerecord/lib/active_record/railties/databases.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 4044f5f7b2..44cc1a079f 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -525,7 +525,7 @@ module ActiveRecord
conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
table_rows = fs.table_rows
- table_rows.keys.each do |table|
+ table_rows.each_key do |table|
conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
end
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 458862a538..44765bd050 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -215,7 +215,7 @@ db_namespace = namespace :db do
Dir["#{base_dir}/**/*.yml"].each do |file|
if data = YAML::load(ERB.new(IO.read(file)).result)
- data.keys.each do |key|
+ data.each_key do |key|
key_id = ActiveRecord::FixtureSet.identify(key)
if key == label || key_id == id.to_i