aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRaghunadh <raghunadhd@gmail.com>2012-02-09 19:03:58 +0530
committerRaghunadh <raghunadhd@gmail.com>2012-02-10 11:22:20 +0530
commitfa464681128b379ca224e01dcefbe683999f8438 (patch)
tree6904a8014fb7c85fe2f660beaf63ecc1fe70b6c0 /activerecord/lib/active_record
parente6c98b83cbf4eab8944601754cc8d0e627b55d6f (diff)
downloadrails-fa464681128b379ca224e01dcefbe683999f8438.tar.gz
rails-fa464681128b379ca224e01dcefbe683999f8438.tar.bz2
rails-fa464681128b379ca224e01dcefbe683999f8438.zip
Refactored code
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake2
-rw-r--r--activerecord/lib/active_record/relation/calculations.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 822b51e838..e2b30dfce3 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -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"
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)
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index 50239f7cb2..8b11d5b586 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -286,7 +286,7 @@ module ActiveRecord
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)
}