aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-06-02 11:44:52 +0200
committerYves Senn <yves.senn@gmail.com>2015-06-02 11:44:52 +0200
commitde412eed5858540571d738913a36ac8398d9a735 (patch)
treee4ba0bdd570693854506d49fe25c873c8d4c91d1 /activerecord
parentc87cce1ddfe2a68dd598bece49769f3f72322a28 (diff)
parent2dd95a775c7aa9565f5b43f41ccf09a302ca1832 (diff)
downloadrails-de412eed5858540571d738913a36ac8398d9a735.tar.gz
rails-de412eed5858540571d738913a36ac8398d9a735.tar.bz2
rails-de412eed5858540571d738913a36ac8398d9a735.zip
Merge pull request #20413 from kddeisz/pluck_postgres_fix
Fix postgresql DISTINCT requirement in pluck test
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/calculations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 4a9bc7845f..cb4681109c 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -647,9 +647,9 @@ class CalculationsTest < ActiveRecord::TestCase
end
def test_pluck_loaded_relation_sql_fragment
- companies = Company.order(:id).limit(3).load
+ companies = Company.order(:name).limit(3).load
assert_queries 1 do
- assert_equal ['37signals', 'Summit', 'Microsoft'], companies.pluck('DISTINCT name')
+ assert_equal ['37signals', 'Apex', 'Ex Nihilo'], companies.pluck('DISTINCT name')
end
end