diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-05 15:19:36 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-05 15:19:36 -0700 |
commit | bad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271 (patch) | |
tree | bb937d1f9b8dde00312f0e5af0c06386baf89c2d /activerecord/test/cases | |
parent | 4d8bc1da8804b81f4c8eb298cd9383160f0a3825 (diff) | |
parent | 56bf1f74557e68455552eeac1bc975cf9ba57766 (diff) | |
download | rails-bad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271.tar.gz rails-bad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271.tar.bz2 rails-bad119cae5ff6f3d27d82b9bdc9fc3cf4f67d271.zip |
Merge pull request #6173 from mhfs/takes_instead_first
Use `take` instead of `first` to avoid unwanted implicit ordering. Closes #6147.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/finder_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index 54801bd101..630acdbc46 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -113,6 +113,10 @@ class FinderTest < ActiveRecord::TestCase assert_equal [], Topic.find([]) end + def test_find_doesnt_have_implicit_ordering + assert_sql(/^((?!ORDER).)*$/) { Topic.find(1) } + end + def test_find_by_ids_missing_one assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) } end diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 3ef357e297..8cef4423c5 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -255,7 +255,7 @@ class RelationTest < ActiveRecord::TestCase assert_equal nil, Developer.none.calculate(:average, 'salary') end end - + def test_null_relation_metadata_methods assert_equal "", Developer.none.to_sql assert_equal({}, Developer.none.where_values_hash) @@ -1287,6 +1287,10 @@ class RelationTest < ActiveRecord::TestCase assert_equal nil, Post.scoped.find_by("1 = 0") end + test "find_by doesn't have implicit ordering" do + assert_sql(/^((?!ORDER).)*$/) { Post.find_by(author_id: 2) } + end + test "find_by! with hash conditions returns the first matching record" do assert_equal posts(:eager_other), Post.order(:id).find_by!(author_id: 2) end @@ -1299,6 +1303,10 @@ class RelationTest < ActiveRecord::TestCase assert_equal posts(:eager_other), Post.order(:id).find_by!('author_id = ?', 2) end + test "find_by! doesn't have implicit ordering" do + assert_sql(/^((?!ORDER).)*$/) { Post.find_by!(author_id: 2) } + end + test "find_by! raises RecordNotFound if the record is missing" do assert_raises(ActiveRecord::RecordNotFound) do Post.scoped.find_by!("1 = 0") |