From c0eb542e57fe6eaa959218c1a7026e53673ba0cb Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 29 Jul 2016 19:00:45 +0800 Subject: have does_not_support_reverse? support sql functions with commas in nested brackets --- activerecord/lib/active_record/relation/query_methods.rb | 2 +- activerecord/test/cases/relations_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 0749bb30b5..97acf26516 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -1137,7 +1137,7 @@ module ActiveRecord def does_not_support_reverse?(order) # Uses SQL function with multiple arguments. - /\([^()]*,[^()]*\)/.match?(order) || + order.split(',').find { |section| section.count('(') != section.count(')')} || # Uses "nulls first" like construction. /nulls (first|last)\Z/i.match?(order) end diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 5604124bb3..28345a9b3a 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -240,6 +240,15 @@ class RelationTest < ActiveRecord::TestCase assert_raises(ActiveRecord::IrreversibleOrderError) do Topic.order("concat(author_name, title)").reverse_order end + assert_raises(ActiveRecord::IrreversibleOrderError) do + Topic.order("concat(lower(author_name), title)").reverse_order + end + assert_raises(ActiveRecord::IrreversibleOrderError) do + Topic.order("concat(author_name, lower(title))").reverse_order + end + assert_raises(ActiveRecord::IrreversibleOrderError) do + Topic.order("concat(lower(author_name), title, length(title)").reverse_order + end end def test_reverse_order_with_nulls_first_or_last -- cgit v1.2.3 From d929a218c47b7a5ffc3f8989676a99edb992e2aa Mon Sep 17 00:00:00 2001 From: Jack Chen Songyong Date: Fri, 29 Jul 2016 22:29:21 +0800 Subject: check if order contains comma first in does_not_support_reverse? --- activerecord/lib/active_record/relation/query_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 97acf26516..099bbe1292 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -1137,7 +1137,7 @@ module ActiveRecord def does_not_support_reverse?(order) # Uses SQL function with multiple arguments. - order.split(',').find { |section| section.count('(') != section.count(')')} || + (order.include?(',') && order.split(',').find { |section| section.count('(') != section.count(')')}) || # Uses "nulls first" like construction. /nulls (first|last)\Z/i.match?(order) end -- cgit v1.2.3