diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/activerecord.gemspec | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 1387d6e288..b8a980b1fb 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) - s.add_dependency('arel', '~> 1.0.1') + s.add_dependency('arel', '~> 2.0.0') s.add_dependency('tzinfo', '~> 0.3.23') end diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 6a33edeb97..c97b1a24d2 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -135,14 +135,13 @@ module ActiveRecord end def reverse_order - order_clause = arel.order_clauses.join(', ') - relation = except(:order) + order_clause = arel.order_clauses - order = order_clause.blank? ? + order = order_clause.empty? ? "#{@klass.table_name}.#{@klass.primary_key} DESC" : - reverse_sql_order(order_clause) + reverse_sql_order(order_clause).join(', ') - relation.order(Arel::SqlLiteral.new(order)) + except(:order).order(Arel::SqlLiteral.new(order)) end def arel @@ -283,15 +282,15 @@ module ActiveRecord end def reverse_sql_order(order_query) - order_query.split(',').each { |s| + order_query.join(', ').split(',').collect { |s| if s.match(/\s(asc|ASC)$/) - s.gsub!(/\s(asc|ASC)$/, ' DESC') + s.gsub(/\s(asc|ASC)$/, ' DESC') elsif s.match(/\s(desc|DESC)$/) - s.gsub!(/\s(desc|DESC)$/, ' ASC') + s.gsub(/\s(desc|DESC)$/, ' ASC') else - s.concat(' DESC') + s + ' DESC' end - }.join(',') + } end def array_of_strings?(o) |