Skip to content
Browse files

Merge pull request #4984 from raghunadhd/change_orderhash

Refactored code
  • Loading branch information...
2 parents f9e2694 + fa46468 commit 2aec357b7e8e310be107b479224524f12f83d5a5 @vijaydev vijaydev committed
View
2 activerecord/lib/active_record/railties/databases.rake
@@ -546,7 +546,7 @@ namespace :railties do
# desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2"
task :migrations => :'db:load_config' do
to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
- railties = ActiveSupport::OrderedHash.new
+ railties = {}
Rails.application.railties.all do |railtie|
next unless to_load == :all || to_load.include?(railtie.railtie_name)
View
2 activerecord/lib/active_record/relation/calculations.rb
@@ -299,7 +299,7 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
key_records = Hash[key_records.map { |r| [r.id, r] }]
end
- ActiveSupport::OrderedHash[calculated_data.map do |row|
+ Hash[calculated_data.map do |row|
key = group_columns.map { |aliaz, column|
type_cast_calculated_value(row[aliaz], column)
}
View
2 activerecord/test/cases/nested_attributes_test.rb
@@ -663,7 +663,7 @@ def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false
end
def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models
- attributes = ActiveSupport::OrderedHash.new
+ attributes = {}
attributes['123726353'] = { :name => 'Grace OMalley' }
attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353
@pirate.send(association_setter, attributes)

0 comments on commit 2aec357

Please sign in to comment.
Something went wrong with that request. Please try again.