diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 14:54:31 -0700 |
| commit | 5c7633cd30a80e9cf747ff39798aea8c03f70420 (patch) | |
| tree | da9378390da9aefbb3e0e7647296ded57f50d683 /activerecord/test | |
| parent | ee46f1d5d2a8825de2d4973fb0301f2d85986e73 (diff) | |
| parent | f6e7e11ad28555860bb8a1bb362fa091f48cc81a (diff) | |
| download | rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.gz rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.tar.bz2 rails-5c7633cd30a80e9cf747ff39798aea8c03f70420.zip | |
Merge branch 'master' into joindep
* master:
use the cached arel table
Fix typo in the changelog entry
Don't remove the select values to add they back again
Pluck on NullRelation accepts a list of columns
Conflicts:
activerecord/lib/active_record/relation/finder_methods.rb
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/relations_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index ec43ded690..860bd424b7 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -274,7 +274,7 @@ class RelationTest < ActiveRecord::TestCase def test_none_chained_to_methods_firing_queries_straight_to_db assert_no_queries do - assert_equal [], Developer.none.pluck(:id) # => uses select_all + assert_equal [], Developer.none.pluck(:id, :name) assert_equal 0, Developer.none.delete_all assert_equal 0, Developer.none.update_all(:name => 'David') assert_equal 0, Developer.none.delete(1) |