diff options
author | Arun Agrawal <arunagw@gmail.com> | 2013-05-10 15:41:51 +0200 |
---|---|---|
committer | Arun Agrawal <arunagw@gmail.com> | 2013-05-10 16:05:05 +0200 |
commit | de5b89ddc9f9f45760856a1eb55f53a11d067a74 (patch) | |
tree | e2c75c57db9bfce2524df641cba63aa268c8fb0c /activerecord | |
parent | 6ab3c730621035ef60eb117f7f9943f5c8fb4536 (diff) | |
download | rails-de5b89ddc9f9f45760856a1eb55f53a11d067a74.tar.gz rails-de5b89ddc9f9f45760856a1eb55f53a11d067a74.tar.bz2 rails-de5b89ddc9f9f45760856a1eb55f53a11d067a74.zip |
Fixed pluck to be working with selects.
See #9777 for details.
Previously pluck is not returning what we wanted to
Added a test also to make sure it's working fine.
This will also fix the build for 1.8.7 as we
were doing some sort on hash.
Thanks @pixeltrix for helping me out.
Thanks @linduxed for pairing with me.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 5 | ||||
-rw-r--r-- | activerecord/test/cases/calculations_test.rb | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index dddd1f46a1..d4765a6782 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -181,8 +181,11 @@ module ActiveRecord column_name = "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}" end + result = klass.connection.exec_query(select(column_name).to_sql) + last_column = result.columns.last + klass.connection.select_all(select(column_name).arel).map! do |attributes| - klass.type_cast_attribute(attributes.keys.first, klass.initialize_attributes(attributes)) + klass.type_cast_attribute(last_column, klass.initialize_attributes(attributes)) end end diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index b9050c750f..8755e1f580 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -494,8 +494,9 @@ class CalculationsTest < ActiveRecord::TestCase end def test_pluck_does_not_replace_select_clause - taks_relation = Topic.select("approved, id, id AS foo_id").order(:foo_id) - assert_equal [false, true, true, true], taks_relation.pluck(:approved) + taks_relation = Topic.select("approved, id, id AS foo_id").order('foo_id DESC') + assert_equal [4,3,2,1], taks_relation.pluck(:id) + assert_equal [true, true, true, false], taks_relation.pluck(:approved) end def test_pluck_auto_table_name_prefix |