github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

use blank? instead of present?, mark SQL literals as SQL literals

Browse Source 
Conflicts:

	activerecord/lib/active_record/relation/query_methods.rb
This commit is contained in:
Aaron Patterson
2010-08-24 18:29:53 -07:00
parent b28cafe01a
commit ffdda4ddfb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -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