adding order clauses method to the select manager

5 files changed, 31 insertions, 3 deletions

diff --git a/lib/arel.rb b/lib/arel.rb
index 2bfdef15d5..4772e9f4b0 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -26,4 +26,5 @@ require 'arel/expression'
 
 require 'arel/visitors/to_sql'
 require 'arel/visitors/join_sql'
+require 'arel/visitors/order_clauses'
 require 'arel/visitors/dot'
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|
diff --git a/spec/arel/select_manager_spec.rb b/spec/arel/select_manager_spec.rb
index 380e381756..6155842241 100644
--- a/spec/arel/select_manager_spec.rb
+++ b/spec/arel/select_manager_spec.rb
@@ -80,6 +80,17 @@ module Arel
       end
     end
 
+    describe 'order_clauses' do
+      it 'returns order clauses as a list' do
+        table   = Table.new :users
+        aliaz   = table.alias
+        manager = Arel::SelectManager.new Table.engine
+        manager.from table
+        manager.order table[:id]
+        manager.order_clauses.first.should be_like %{ "users"."id" }
+      end
+    end
+
     describe 'delete' do
       it "copies from" do
         engine  = EngineProxy.new Table.engine