diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-08-17 00:28:56 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-08-17 00:28:56 -0300 |
| commit | 8debad2a18ff497d7410ffe2ceb7eec2bc13f454 (patch) | |
| tree | 30d7c5c99c0dc7262866340cd49ac1e95c1d6b0b /activerecord/lib/active_record | |
| parent | 5fe02881b11b3e7ade089df1b46fff249137fdf8 (diff) | |
| parent | d929a218c47b7a5ffc3f8989676a99edb992e2aa (diff) | |
| download | rails-8debad2a18ff497d7410ffe2ceb7eec2bc13f454.tar.gz rails-8debad2a18ff497d7410ffe2ceb7eec2bc13f454.tar.bz2 rails-8debad2a18ff497d7410ffe2ceb7eec2bc13f454.zip | |
Merge pull request #25987 from aquajach/master
Fix does_not_support_reverse? to find sql functions with commas in nested brackets
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 1a59b3a146..47976fa735 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.include?(',') && order.split(',').find { |section| section.count('(') != section.count(')')}) || # Uses "nulls first" like construction. /nulls (first|last)\Z/i.match?(order) end |