From 691c9d2d9643211bcc2d24f68ef05f0418a157e6 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 19 Oct 2010 11:47:00 -0700 Subject: doing a little cleanup on the visitors --- lib/arel/visitors/dot.rb | 6 +++--- lib/arel/visitors/join_sql.rb | 2 ++ lib/arel/visitors/mysql.rb | 2 ++ lib/arel/visitors/order_clauses.rb | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb index 5202c5127e..2ce8b6814f 100644 --- a/lib/arel/visitors/dot.rb +++ b/lib/arel/visitors/dot.rb @@ -1,6 +1,6 @@ module Arel module Visitors - class Dot + class Dot < Arel::Visitors::Visitor class Node # :nodoc: attr_accessor :name, :id, :fields @@ -23,7 +23,7 @@ module Arel end def accept object - visit object + super to_dot end @@ -188,7 +188,7 @@ module Arel @seen[node.id] = node @nodes << node with_node node do - send "visit_#{o.class.name.gsub('::', '_')}", o + super end end diff --git a/lib/arel/visitors/join_sql.rb b/lib/arel/visitors/join_sql.rb index 49625e850d..d3fb18d3c6 100644 --- a/lib/arel/visitors/join_sql.rb +++ b/lib/arel/visitors/join_sql.rb @@ -9,6 +9,8 @@ module Arel # This visitor is used in SelectManager#join_sql and is for backwards # compatibility with Arel V1.0 class JoinSql < Arel::Visitors::ToSql + private + def visit_Arel_Nodes_SelectCore o [o.froms].grep(Nodes::Join).map { |x| visit x }.join ', ' end diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb index 4551223591..0c94ee1b27 100644 --- a/lib/arel/visitors/mysql.rb +++ b/lib/arel/visitors/mysql.rb @@ -1,6 +1,8 @@ module Arel module Visitors class MySQL < Arel::Visitors::ToSql + private + def visit_Arel_Nodes_UpdateStatement o [ "UPDATE #{visit o.relation}", diff --git a/lib/arel/visitors/order_clauses.rb b/lib/arel/visitors/order_clauses.rb index 9326897f68..11dbfdad2a 100644 --- a/lib/arel/visitors/order_clauses.rb +++ b/lib/arel/visitors/order_clauses.rb @@ -1,6 +1,8 @@ module Arel module Visitors class OrderClauses < Arel::Visitors::ToSql + private + def visit_Arel_Nodes_SelectStatement o o.orders.map { |x| visit x } end -- cgit v1.2.3