diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-29 14:03:19 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-29 14:03:19 -0300 |
| commit | 035cc69c48d9d538bded70fc88976cd7f23966f5 (patch) | |
| tree | db1f7ca0d8deea3063a4e19c50a0a274a07c1140 /activerecord | |
| parent | 06f992730efa0864a987b428774ca83ece0c0b0a (diff) | |
| parent | e2b49b203f2cb6cef93283f14838f21bf6ffb4a2 (diff) | |
| download | rails-035cc69c48d9d538bded70fc88976cd7f23966f5.tar.gz rails-035cc69c48d9d538bded70fc88976cd7f23966f5.tar.bz2 rails-035cc69c48d9d538bded70fc88976cd7f23966f5.zip | |
Merge pull request #17099 from sferik/each_key
Use Hash#each_key instead of Hash#keys.each
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
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 |