aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-24 18:36:59 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-24 18:36:59 -0700
commitda958b98ea86a24b1c79cfb0cef7e42d58646ba9 (patch)
treed6f868e2cb7962c6e5ab95457c6afab9aa5db4fc /lib/arel
parent9c4670c6505d462c27a58a84e6b0746e20b98e7f (diff)
downloadrails-da958b98ea86a24b1c79cfb0cef7e42d58646ba9.tar.gz
rails-da958b98ea86a24b1c79cfb0cef7e42d58646ba9.tar.bz2
rails-da958b98ea86a24b1c79cfb0cef7e42d58646ba9.zip
adding order clauses method to the select manager
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/select_manager.rb9
-rw-r--r--lib/arel/visitors/order_clauses.rb9
-rw-r--r--lib/arel/visitors/to_sql.rb4
3 files changed, 19 insertions, 3 deletions
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|