From da958b98ea86a24b1c79cfb0cef7e42d58646ba9 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 24 Aug 2010 18:36:59 -0700 Subject: adding order clauses method to the select manager --- lib/arel/select_manager.rb | 9 ++++++++- lib/arel/visitors/order_clauses.rb | 9 +++++++++ lib/arel/visitors/to_sql.rb | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 lib/arel/visitors/order_clauses.rb (limited to 'lib/arel') diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index a791b68688..8033846a55 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -29,7 +29,10 @@ module Arel end def order *expr - @head.orders.concat expr + # FIXME: We SHOULD NOT be converting these to SqlLiteral automatically + @head.orders.concat expr.map { |x| + String === x ? Nodes::SqlLiteral.new(x) : x + } self end @@ -47,6 +50,10 @@ module Arel Nodes::SqlLiteral.new viz.accept @ctx end + def order_clauses + Visitors::OrderClauses.new(@engine).accept @head + end + def joins manager manager.join_sql end diff --git a/lib/arel/visitors/order_clauses.rb b/lib/arel/visitors/order_clauses.rb new file mode 100644 index 0000000000..9326897f68 --- /dev/null +++ b/lib/arel/visitors/order_clauses.rb @@ -0,0 +1,9 @@ +module Arel + module Visitors + class OrderClauses < Arel::Visitors::ToSql + def visit_Arel_Nodes_SelectStatement o + o.orders.map { |x| visit x } + end + end + end +end diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index a798d888d3..927ecbb0b0 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -126,8 +126,8 @@ module Arel DISPATCH = {} def visit object - send "visit_#{object.class.name.gsub('::', '_')}", object - #send DISPATCH[object.class], object + #send "visit_#{object.class.name.gsub('::', '_')}", object + send DISPATCH[object.class], object end private_instance_methods(false).each do |method| -- cgit v1.2.3