From 9c4670c6505d462c27a58a84e6b0746e20b98e7f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 24 Aug 2010 18:13:01 -0700
Subject: moving visitor logic to the visitor

---
 lib/arel/select_manager.rb    | 4 +---
 lib/arel/visitors/join_sql.rb | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/arel')

diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 736b122399..a791b68688 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -44,9 +44,7 @@ module Arel
 
     def join_sql
       viz = Visitors::JoinSql.new @engine
-      Nodes::SqlLiteral.new(
-        @ctx.froms.grep(Nodes::Join).map { |x| viz.accept x }.join ', '
-      )
+      Nodes::SqlLiteral.new viz.accept @ctx
     end
 
     def joins manager
diff --git a/lib/arel/visitors/join_sql.rb b/lib/arel/visitors/join_sql.rb
index 95b27b4476..0353d687eb 100644
--- a/lib/arel/visitors/join_sql.rb
+++ b/lib/arel/visitors/join_sql.rb
@@ -9,6 +9,10 @@ module Arel
     # This visitor is used in SelectManager#join_sql and is for backwards
     # compatibility with Arel V1.0
     class JoinSql < Arel::Visitors::ToSql
+      def visit_Arel_Nodes_SelectCore o
+        o.froms.grep(Nodes::Join).map { |x| visit x }.join ', '
+      end
+
       def visit_Arel_Nodes_OuterJoin o
         "OUTER JOIN #{visit o.right} #{visit o.constraint}"
       end
-- 
cgit v1.2.3