提交 fa464681 编写于 作者: R Raghunadh

Refactored code

上级 e6c98b83
...@@ -542,7 +542,7 @@ namespace :railties do ...@@ -542,7 +542,7 @@ namespace :railties do
# desc "Copies missing migrations from Railties (e.g. engines). You can specify Railties to use with FROM=railtie1,railtie2" # 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 task :migrations => :'db:load_config' do
to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip } to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
railties = ActiveSupport::OrderedHash.new railties = {}
Rails.application.railties.all do |railtie| Rails.application.railties.all do |railtie|
next unless to_load == :all || to_load.include?(railtie.railtie_name) next unless to_load == :all || to_load.include?(railtie.railtie_name)
......
...@@ -286,7 +286,7 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc: ...@@ -286,7 +286,7 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
key_records = Hash[key_records.map { |r| [r.id, r] }] key_records = Hash[key_records.map { |r| [r.id, r] }]
end end
ActiveSupport::OrderedHash[calculated_data.map do |row| Hash[calculated_data.map do |row|
key = group_columns.map { |aliaz, column| key = group_columns.map { |aliaz, column|
type_cast_calculated_value(row[aliaz], column) type_cast_calculated_value(row[aliaz], column)
} }
......
...@@ -663,7 +663,7 @@ def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false ...@@ -663,7 +663,7 @@ def test_should_ignore_new_associated_records_if_a_reject_if_proc_returns_false
end end
def test_should_sort_the_hash_by_the_keys_before_building_new_associated_models 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['123726353'] = { :name => 'Grace OMalley' }
attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353 attributes['2'] = { :name => 'Privateers Greed' } # 2 is lower then 123726353
@pirate.send(association_setter, attributes) @pirate.send(association_setter, attributes)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册