Merge pull request #35274 from AlexBrodianoi/fix_does_not_support_reverse

Raise ActiveRecord::IrreversibleOrderError if nulls first/last is not a single ordering argument.
This commit is contained in:
Ryuta Kamizono 2019-02-17 12:39:44 +09:00 committed by GitHub
commit 5ca19efafe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -1111,7 +1111,7 @@ module ActiveRecord
# Uses SQL function with multiple arguments.
(order.include?(",") && order.split(",").find { |section| section.count("(") != section.count(")") }) ||
# Uses "nulls first" like construction.
/nulls (first|last)\Z/i.match?(order)
/\bnulls\s+(?:first|last)\b/i.match?(order)
end
def build_order(arel)

View File

@ -287,12 +287,21 @@ class RelationTest < ActiveRecord::TestCase
end
def test_reverse_order_with_nulls_first_or_last
assert_raises(ActiveRecord::IrreversibleOrderError) do
Topic.order(Arel.sql("title NULLS FIRST")).reverse_order
end
assert_raises(ActiveRecord::IrreversibleOrderError) do
Topic.order(Arel.sql("title NULLS FIRST")).reverse_order
end
assert_raises(ActiveRecord::IrreversibleOrderError) do
Topic.order(Arel.sql("title nulls last")).reverse_order
end
assert_raises(ActiveRecord::IrreversibleOrderError) do
Topic.order(Arel.sql("title NULLS FIRST, author_name")).reverse_order
end
assert_raises(ActiveRecord::IrreversibleOrderError) do
Topic.order(Arel.sql("author_name, title nulls last")).reverse_order
end
end
def test_default_reverse_order_on_table_without_primary_key