Cache visitor dispatch on a per-visitor basis

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/arel/visitors/visitor.rb b/lib/arel/visitors/visitor.rb
index 204657883f..33ec5eafb4 100644
--- a/lib/arel/visitors/visitor.rb
+++ b/lib/arel/visitors/visitor.rb
@@ -7,12 +7,15 @@ module Arel
 
       private
 
-      DISPATCH = Hash.new do |hash, klass|
-        hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+      DISPATCH = Hash.new do |hash, visitor_class|
+        hash[visitor_class] =
+          Hash.new do |hash, node_class|
+            hash[node_class] = "visit_#{(node_class.name || '').gsub('::', '_')}"
+          end
       end
 
       def dispatch
-        DISPATCH
+        DISPATCH[self.class]
       end
 
       def visit object, attribute = nil