From ffdda4ddfb76fec92faea714f03a37baf75351ef Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 24 Aug 2010 18:29:53 -0700 Subject: use blank? instead of present?, mark SQL literals as SQL literals Conflicts: activerecord/lib/active_record/relation/query_methods.rb --- activerecord/lib/active_record/relation/query_methods.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 321beadb0c..bb9cdaaefe 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -99,11 +99,11 @@ module ActiveRecord order_clause = arel.order_clauses.join(', ') relation = except(:order) - unless order_clauses.blank? - relation.order(reverse_sql_order(order_clause)) - else - relation.order("#{@klass.table_name}.#{@klass.primary_key} DESC") - end + order = order_clause.blank? ? + "#{@klass.table_name}.#{@klass.primary_key} DESC" : + reverse_sql_order(order_clause) + + relation.order Arel::SqlLiteral.new order end def arel -- cgit v1.2.3