adding better dot file support for our nodes

5 files changed, 41 insertions, 5 deletions

diff --git a/lib/arel/nodes/does_not_match.rb b/lib/arel/nodes/does_not_match.rb
index b5693df711..33bdeab005 100644
--- a/lib/arel/nodes/does_not_match.rb
+++ b/lib/arel/nodes/does_not_match.rb
@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class DoesNotMatch < Binary
+    class DoesNotMatch < Arel::Nodes::Binary
     end
   end
 end
diff --git a/lib/arel/nodes/matches.rb b/lib/arel/nodes/matches.rb
index 4b9fd34ad1..5ef8ac8302 100644
--- a/lib/arel/nodes/matches.rb
+++ b/lib/arel/nodes/matches.rb
@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class Matches < Binary
+    class Matches < Arel::Nodes::Binary
     end
   end
 end
diff --git a/lib/arel/nodes/not_in.rb b/lib/arel/nodes/not_in.rb
index 6cb2c6f832..6c01921a46 100644
--- a/lib/arel/nodes/not_in.rb
+++ b/lib/arel/nodes/not_in.rb
@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class NotIn < Binary
+    class NotIn < Arel::Nodes::Binary
     end
   end
 end
diff --git a/lib/arel/nodes/unqualified_column.rb b/lib/arel/nodes/unqualified_column.rb
index 31561fddd4..9882cb08e2 100644
--- a/lib/arel/nodes/unqualified_column.rb
+++ b/lib/arel/nodes/unqualified_column.rb
@@ -1,6 +1,8 @@
 module Arel
   module Nodes
     class UnqualifiedColumn
+      attr_accessor :attribute
+
       def initialize attribute
         @attribute = attribute
       end
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index 3d25d5f012..b75385067a 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -38,6 +38,13 @@ module Arel
         visit_edge o, "columns"
       end
 
+      def visit_Arel_Nodes_Sum o
+        visit_edge o, "expressions"
+        visit_edge o, "alias"
+      end
+      alias :visit_Arel_Nodes_Max :visit_Arel_Nodes_Sum
+      alias :visit_Arel_Nodes_Avg :visit_Arel_Nodes_Sum
+
       def visit_Arel_Nodes_Count o
         visit_edge o, "expressions"
         visit_edge o, "distinct"
@@ -54,10 +61,27 @@ module Arel
       def visit_Arel_Nodes_StringJoin o
         visit_edge o, "left"
         visit_edge o, "right"
+      end
+
+      def visit_Arel_Nodes_InnerJoin o
+        visit_edge o, "left"
+        visit_edge o, "right"
         visit_edge o, "constraint"
       end
-      alias :visit_Arel_Nodes_InnerJoin :visit_Arel_Nodes_StringJoin
-      alias :visit_Arel_Nodes_OuterJoin :visit_Arel_Nodes_StringJoin
+      alias :visit_Arel_Nodes_OuterJoin :visit_Arel_Nodes_InnerJoin
+
+      def visit_Arel_Nodes_DeleteStatement o
+        visit_edge o, "relation"
+        visit_edge o, "wheres"
+      end
+
+      def visit_Arel_Nodes_UnqualifiedColumn o
+        visit_edge o, "attribute"
+      end
+
+      def visit_Arel_Nodes_Offset o
+        visit_edge o, "value"
+      end
 
       def visit_Arel_Nodes_InsertStatement o
         visit_edge o, "relation"
@@ -109,16 +133,26 @@ module Arel
       alias :visit_Arel_Nodes_GreaterThanOrEqual :visit_Arel_Nodes_Equality
       alias :visit_Arel_Nodes_Assignment         :visit_Arel_Nodes_Equality
       alias :visit_Arel_Nodes_In                 :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_LessThan           :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_LessThanOrEqual    :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_Between            :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_NotIn              :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_DoesNotMatch       :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_Matches            :visit_Arel_Nodes_Equality
 
       def visit_String o
         @node_stack.last.fields << o
       end
       alias :visit_Time :visit_String
+      alias :visit_Date :visit_String
+      alias :visit_DateTime :visit_String
       alias :visit_NilClass :visit_String
       alias :visit_TrueClass :visit_String
       alias :visit_FalseClass :visit_String
       alias :visit_Arel_SqlLiteral :visit_String
       alias :visit_Fixnum :visit_String
+      alias :visit_BigDecimal :visit_String
+      alias :visit_Float :visit_String
       alias :visit_Symbol :visit_String
       alias :visit_Arel_Nodes_SqlLiteral :visit_String