Make it the responsibility of the connection to hold on to a visitor for generating SQL, rather than the TreeManager. (There is a related commit coming in Active Record.)

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb
index 5722baca77..99a7164e2e 100644
--- a/lib/arel/tree_manager.rb
+++ b/lib/arel/tree_manager.rb
@@ -4,21 +4,23 @@ module Arel
     include Arel::Relation
     include Arel::FactoryMethods
 
-    attr_accessor :visitor
     attr_reader :ast, :engine
 
     def initialize engine
-      @engine  = engine
-      @visitor = Visitors.visitor_for @engine
-      @ctx     = nil
+      @engine = engine
+      @ctx    = nil
     end
 
     def to_dot
       Visitors::Dot.new.accept @ast
     end
 
+    def visitor
+      engine.connection.visitor
+    end
+
     def to_sql
-      @visitor.accept @ast
+      visitor.accept @ast
     end
 
     def initialize_copy other