diff --git a/lib/arel.rb b/lib/arel.rb index 2bfdef15d5791e5290ecfca64176cca56e9e145e..4772e9f4b03ace6cf45c42f183ac4f82ca2ba9af 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -26,4 +26,5 @@ 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 a791b686884ad59e61172a0eedef7ece30cee5b6..8033846a558cd28616d36a5dddcacea591284c14 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -29,7 +29,10 @@ def where expr 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 @@ def join_sql 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 0000000000000000000000000000000000000000..9326897f687c5bc1b26fc85a9ca8b6674fdd7e11 --- /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 a798d888d372435d5d373b313e9cf01745b84079..927ecbb0b05dcf1b367555121faffd26fed64318 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -126,8 +126,8 @@ def visit_Time o; quote(o) end 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 380e3817568e7186ff210ae83a0c8a731f38aff9..615584224132828c322b4c542fb566014176cec4 100644 --- a/spec/arel/select_manager_spec.rb +++ b/spec/arel/select_manager_spec.rb @@ -80,6 +80,17 @@ def execute sql, name = nil 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