提交 3e75369b 编写于 作者: R Rafael Mendonça França

Merge pull request #7926 from senny/whitespace_cleanup

trailling whitespace cleanup in query_methods.rb [ci skip] 
...@@ -202,13 +202,13 @@ def group!(*args) ...@@ -202,13 +202,13 @@ def group!(*args)
# #
# User.order('name DESC, email') # User.order('name DESC, email')
# => SELECT "users".* FROM "users" ORDER BY name DESC, email # => SELECT "users".* FROM "users" ORDER BY name DESC, email
# #
# User.order(:name) # User.order(:name)
# => SELECT "users".* FROM "users" ORDER BY "users"."name" ASC # => SELECT "users".* FROM "users" ORDER BY "users"."name" ASC
# #
# User.order(email: :desc) # User.order(email: :desc)
# => SELECT "users".* FROM "users" ORDER BY "users"."email" DESC # => SELECT "users".* FROM "users" ORDER BY "users"."email" DESC
# #
# User.order(:name, email: :desc) # User.order(:name, email: :desc)
# => SELECT "users".* FROM "users" ORDER BY "users"."name" ASC, "users"."email" DESC # => SELECT "users".* FROM "users" ORDER BY "users"."name" ASC, "users"."email" DESC
def order(*args) def order(*args)
...@@ -218,7 +218,7 @@ def order(*args) ...@@ -218,7 +218,7 @@ def order(*args)
# Like #order, but modifies relation in place. # Like #order, but modifies relation in place.
def order!(*args) def order!(*args)
args.flatten! args.flatten!
validate_order_args args validate_order_args args
references = args.reject { |arg| Arel::Node === arg } references = args.reject { |arg| Arel::Node === arg }
...@@ -245,7 +245,7 @@ def reorder(*args) ...@@ -245,7 +245,7 @@ def reorder(*args)
# Like #reorder, but modifies relation in place. # Like #reorder, but modifies relation in place.
def reorder!(*args) def reorder!(*args)
args.flatten! args.flatten!
validate_order_args args validate_order_args args
self.reordering_value = true self.reordering_value = true
...@@ -803,9 +803,9 @@ def reverse_sql_order(order_query) ...@@ -803,9 +803,9 @@ def reverse_sql_order(order_query)
s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC') s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
end end
when Symbol when Symbol
{ o => :desc } { o => :desc }
when Hash when Hash
o.each_with_object({}) do |(field, dir), memo| o.each_with_object({}) do |(field, dir), memo|
memo[field] = (dir == :asc ? :desc : :asc ) memo[field] = (dir == :asc ? :desc : :asc )
end end
else else
...@@ -817,25 +817,25 @@ def reverse_sql_order(order_query) ...@@ -817,25 +817,25 @@ def reverse_sql_order(order_query)
def array_of_strings?(o) def array_of_strings?(o)
o.is_a?(Array) && o.all?{|obj| obj.is_a?(String)} o.is_a?(Array) && o.all?{|obj| obj.is_a?(String)}
end end
def build_order(arel) def build_order(arel)
orders = order_values orders = order_values
orders = reverse_sql_order(orders) if reverse_order_value orders = reverse_sql_order(orders) if reverse_order_value
orders = orders.uniq.reject(&:blank?).map do |order| orders = orders.uniq.reject(&:blank?).map do |order|
case order case order
when Symbol when Symbol
table[order].asc table[order].asc
when Hash when Hash
order.map { |field, dir| table[field].send(dir) } order.map { |field, dir| table[field].send(dir) }
else else
order order
end end
end.flatten end.flatten
arel.order(*orders) unless orders.empty? arel.order(*orders) unless orders.empty?
end end
def validate_order_args(args) def validate_order_args(args)
args.select { |a| Hash === a }.each do |h| args.select { |a| Hash === a }.each do |h|
unless (h.values - [:asc, :desc]).empty? unless (h.values - [:asc, :desc]).empty?
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册