Ticket #6559: faster_add_order.patch
| File faster_add_order.patch, 1.1 kB (added by skaes, 2 years ago) |
|---|
-
activerecord/lib/active_record/base.rb
old new 1096 1098 1097 1099 sql << " GROUP BY #{options[:group]} " if options[:group] 1098 1100 1099 add_order!(sql, options[:order] )1101 add_order!(sql, options[:order], scope) 1100 1102 add_limit!(sql, options, scope) 1101 1103 add_lock!(sql, options, scope) 1102 1104 … … 1120 1122 end 1121 1123 end 1122 1124 1123 def add_order!(sql, order) 1125 def add_order!(sql, order, scope = :auto) 1126 scope = scope(:find) if :auto == scope 1127 scoped_order = scope[:order] if scope 1124 1128 if order 1125 1129 sql << " ORDER BY #{order}" 1126 sql << ", #{scope (:find, :order)}" if scoped?(:find, :order)1130 sql << ", #{scoped_order}" if scoped_order 1127 1131 else 1128 sql << " ORDER BY #{scope (:find, :order)}" if scoped?(:find, :order)1132 sql << " ORDER BY #{scoped_order}" if scoped_order 1129 1133 end 1130 1134 end 1131 1135
