diff options
| author | Kevin Deisz <kevin.deisz@gmail.com> | 2015-05-29 09:41:03 -0400 |
|---|---|---|
| committer | Kevin Deisz <kevin.deisz@gmail.com> | 2015-05-29 10:32:32 -0400 |
| commit | 777fa257aaa962bf67f6e5522efaa420ea7dc88b (patch) | |
| tree | 088161d48ab11cca58e09cb3d49c73a3f76db613 /activerecord | |
| parent | 343dad9617e7448bf8effc7c70ae13bede38fd32 (diff) | |
| download | rails-777fa257aaa962bf67f6e5522efaa420ea7dc88b.tar.gz rails-777fa257aaa962bf67f6e5522efaa420ea7dc88b.tar.bz2 rails-777fa257aaa962bf67f6e5522efaa420ea7dc88b.zip | |
Allow Enumerable#pluck to take a splat.
This allows easier integration with ActiveRecord, such that
AR#pluck will now use Enumerable#pluck if the relation is loaded,
without needing to hit the database.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 402b317d9c..7a28a98721 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -161,6 +161,10 @@ module ActiveRecord end end + if loaded? && (column_names - @klass.column_names).empty? + return @records.pluck(*column_names) + end + if has_include?(column_names.first) construct_relation_for_association_calculations.pluck(*column_names) else diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index b246eae5f5..4a9bc7845f 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -632,6 +632,27 @@ class CalculationsTest < ActiveRecord::TestCase assert_equal [part.id], ShipPart.joins(:trinkets).pluck(:id) end + def test_pluck_loaded_relation + companies = Company.order(:id).limit(3).load + assert_no_queries do + assert_equal ['37signals', 'Summit', 'Microsoft'], companies.pluck(:name) + end + end + + def test_pluck_loaded_relation_multiple_columns + companies = Company.order(:id).limit(3).load + assert_no_queries do + assert_equal [[1, '37signals'], [2, 'Summit'], [3, 'Microsoft']], companies.pluck(:id, :name) + end + end + + def test_pluck_loaded_relation_sql_fragment + companies = Company.order(:id).limit(3).load + assert_queries 1 do + assert_equal ['37signals', 'Summit', 'Microsoft'], companies.pluck('DISTINCT name') + end + end + def test_grouped_calculation_with_polymorphic_relation part = ShipPart.create!(name: "has trinket") part.trinkets.create! |