to_sql is passing

2 files changed, 160 insertions, 120 deletions

diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 4d5f81659f..545f95df2a 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -120,8 +120,8 @@ module Arel
         collector << quoted(o.val, o.attribute).to_s
       end
 
-      def visit_Arel_Nodes_Quoted o
-        quoted o.expr, nil
+      def visit_Arel_Nodes_Quoted o, collector
+        collector << quoted(o.expr, nil).to_s
       end
 
       def visit_Arel_Nodes_True o, collector
@@ -346,8 +346,9 @@ module Arel
         "OFFSET #{visit o.expr}"
       end
 
-      def visit_Arel_Nodes_Limit o
-        "LIMIT #{visit o.expr}"
+      def visit_Arel_Nodes_Limit o, collector
+        collector << "LIMIT "
+        visit o.expr, collector
       end
 
       # FIXME: this does nothing on most databases, but does on MSSQL
@@ -359,68 +360,72 @@ module Arel
         visit o.expr
       end
 
-      def visit_Arel_Nodes_Grouping o
-        "(#{visit o.expr})"
+      def visit_Arel_Nodes_Grouping o, collector
+        collector << "("
+        visit(o.expr, collector) << ")"
       end
 
-      def visit_Arel_SelectManager o
-        "(#{o.to_sql.rstrip})"
+      def visit_Arel_SelectManager o, collector
+        collector << "(#{o.to_sql.rstrip})"
       end
 
       def visit_Arel_Nodes_Ascending o
         "#{visit o.expr} ASC"
       end
 
-      def visit_Arel_Nodes_Descending o
-        "#{visit o.expr} DESC"
+      def visit_Arel_Nodes_Descending o, collector
+        visit(o.expr, collector) << " DESC"
       end
 
       def visit_Arel_Nodes_Group o
         visit o.expr
       end
 
-      def visit_Arel_Nodes_NamedFunction o
-        "#{o.name}(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x
-        }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_NamedFunction o, collector
+        collector << o.name
+        collector << "("
+        collector << "DISTINCT " if o.distinct
+        collector = inject_join(o.expressions, collector, ", ") << ")"
+        if o.alias
+          collector << " AS "
+          visit o.alias, collector
+        else
+          collector
+        end
       end
 
       def visit_Arel_Nodes_Extract o
         "EXTRACT(#{o.field.to_s.upcase} FROM #{visit o.expr})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
-      def visit_Arel_Nodes_Count o
-        "COUNT(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x
-        }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_Count o, collector
+        aggregate "COUNT", o, collector
       end
 
-      def visit_Arel_Nodes_Sum o
-        "SUM(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x}.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_Sum o, collector
+        aggregate "SUM", o, collector
       end
 
-      def visit_Arel_Nodes_Max o
-        "MAX(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x}.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_Max o, collector
+        aggregate "MAX", o, collector
       end
 
-      def visit_Arel_Nodes_Min o
-        "MIN(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_Min o, collector
+        aggregate "MIN", o, collector
       end
 
-      def visit_Arel_Nodes_Avg o
-        "AVG(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
-          visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      def visit_Arel_Nodes_Avg o, collector
+        aggregate "AVG", o, collector
       end
 
       def visit_Arel_Nodes_TableAlias o
         "#{visit o.relation} #{quote_table_name o.name}"
       end
 
-      def visit_Arel_Nodes_Between o
-        "#{visit o.left} BETWEEN #{visit o.right}"
+      def visit_Arel_Nodes_Between o, collector
+        collector = visit o.left, collector
+        collector << " BETWEEN "
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_GreaterThanOrEqual o, collector
@@ -429,12 +434,16 @@ module Arel
         visit o.right, collector
       end
 
-      def visit_Arel_Nodes_GreaterThan o
-        "#{visit o.left} > #{visit o.right}"
+      def visit_Arel_Nodes_GreaterThan o, collector
+        collector = visit o.left, collector
+        collector << " > "
+        visit o.right, collector
       end
 
-      def visit_Arel_Nodes_LessThanOrEqual o
-        "#{visit o.left} <= #{visit o.right}"
+      def visit_Arel_Nodes_LessThanOrEqual o, collector
+        collector = visit o.left, collector
+        collector << " <= "
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_LessThan o, collector
@@ -443,12 +452,16 @@ module Arel
         visit o.right, collector
       end
 
-      def visit_Arel_Nodes_Matches o
-        "#{visit o.left} LIKE #{visit o.right}"
+      def visit_Arel_Nodes_Matches o, collector
+        collector = visit o.left, collector
+        collector << " LIKE "
+        visit o.right, collector
       end
 
-      def visit_Arel_Nodes_DoesNotMatch o
-        "#{visit o.left} NOT LIKE #{visit o.right}"
+      def visit_Arel_Nodes_DoesNotMatch o, collector
+        collector = visit o.left, collector
+        collector << " NOT LIKE "
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_JoinSource o, collector
@@ -483,8 +496,9 @@ module Arel
         "ON #{visit o.expr}"
       end
 
-      def visit_Arel_Nodes_Not o
-        "NOT (#{visit o.expr})"
+      def visit_Arel_Nodes_Not o, collector
+        collector << "NOT ("
+        visit(o.expr, collector) << ")"
       end
 
       def visit_Arel_Table o, collector
@@ -495,11 +509,13 @@ module Arel
         end
       end
 
-      def visit_Arel_Nodes_In o
+      def visit_Arel_Nodes_In o, collector
         if Array === o.right && o.right.empty?
-          '1=0'
+          collector << '1=0'
         else
-          "#{visit o.left} IN (#{visit o.right})"
+          collector = visit o.left, collector
+          collector << " IN ("
+          visit(o.right, collector) << ")"
         end
       end
 
@@ -524,13 +540,16 @@ module Arel
         visit o.right, collector
       end
 
-      def visit_Arel_Nodes_Assignment o
+      def visit_Arel_Nodes_Assignment o, collector
         case o.right
         when Arel::Nodes::UnqualifiedColumn, Arel::Attributes::Attribute
-          "#{visit o.left} = #{visit o.right}"
+          collector = visit o.left, collector
+          collector << " = "
+          visit o.right, collector
         else
-          right = quote(o.right, column_for(o.left))
-          "#{visit o.left} = #{right}"
+          collector = visit o.left, collector
+          collector << " = "
+          collector << quote(o.right, column_for(o.left)).to_s
         end
       end
 
@@ -547,18 +566,23 @@ module Arel
         end
       end
 
-      def visit_Arel_Nodes_NotEqual o
+      def visit_Arel_Nodes_NotEqual o, collector
         right = o.right
 
+        collector = visit o.left, collector
+
         if right.nil?
-          "#{visit o.left} IS NOT NULL"
+          collector << " IS NOT NULL"
         else
-          "#{visit o.left} != #{visit right}"
+          collector << " != "
+          visit right, collector
         end
       end
 
-      def visit_Arel_Nodes_As o
-        "#{visit o.left} AS #{visit o.right}"
+      def visit_Arel_Nodes_As o, collector
+        collector = visit o.left, collector
+        collector << " AS "
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_UnqualifiedColumn o, collector
@@ -577,7 +601,7 @@ module Arel
       alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute
 
-      def literal o, collector; collector << o; end
+      def literal o, collector; collector << o.to_s; end
 
       alias :visit_Arel_Nodes_BindParam  :literal
       alias :visit_Arel_Nodes_SqlLiteral :literal
@@ -607,8 +631,10 @@ module Arel
       alias :visit_Time                          :unsupported
       alias :visit_TrueClass                     :unsupported
 
-      def visit_Arel_Nodes_InfixOperation o
-        "#{visit o.left} #{o.operator} #{visit o.right}"
+      def visit_Arel_Nodes_InfixOperation o, collector
+        collector = visit o.left, collector
+        collector << " #{o.operator} "
+        visit o.right, collector
       end
 
       alias :visit_Arel_Nodes_Addition       :visit_Arel_Nodes_InfixOperation
@@ -650,6 +676,20 @@ module Arel
           end
         }
       end
+
+      def aggregate name, o, collector
+        collector << "#{name}("
+        if o.distinct
+          collector << "DISTINCT "
+        end
+        collector = inject_join(o.expressions, collector, ", ") << ")"
+        if o.alias
+          collector << " AS "
+          visit o.alias, collector
+        else
+          collector
+        end
+      end
     end
   end
 end
diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb
index bcf2010d97..33c7bb9e93 100644
--- a/test/visitors/test_to_sql.rb
+++ b/test/visitors/test_to_sql.rb
@@ -12,7 +12,7 @@ module Arel
       end
 
       def compile node
-        @visitor.accept(node, @collector).value
+        @visitor.accept(node, Collectors::SQLString.new).value
       end
 
       it 'works with BindParams' do
@@ -45,63 +45,63 @@ module Arel
 
       it 'should visit named functions' do
         function = Nodes::NamedFunction.new('omg', [Arel.star])
-        assert_equal 'omg(*)', @visitor.accept(function)
+        assert_equal 'omg(*)', compile(function)
       end
 
       it 'should chain predications on named functions' do
         function = Nodes::NamedFunction.new('omg', [Arel.star])
-        sql = @visitor.accept(function.eq(2))
+        sql = compile(function.eq(2))
         sql.must_be_like %{ omg(*) = 2 }
       end
 
       it 'should visit built-in functions' do
         function = Nodes::Count.new([Arel.star])
-        assert_equal 'COUNT(*)', @visitor.accept(function)
+        assert_equal 'COUNT(*)', compile(function)
 
         function = Nodes::Sum.new([Arel.star])
-        assert_equal 'SUM(*)', @visitor.accept(function)
+        assert_equal 'SUM(*)', compile(function)
 
         function = Nodes::Max.new([Arel.star])
-        assert_equal 'MAX(*)', @visitor.accept(function)
+        assert_equal 'MAX(*)', compile(function)
 
         function = Nodes::Min.new([Arel.star])
-        assert_equal 'MIN(*)', @visitor.accept(function)
+        assert_equal 'MIN(*)', compile(function)
 
         function = Nodes::Avg.new([Arel.star])
-        assert_equal 'AVG(*)', @visitor.accept(function)
+        assert_equal 'AVG(*)', compile(function)
       end
 
       it 'should visit built-in functions operating on distinct values' do
         function = Nodes::Count.new([Arel.star])
         function.distinct = true
-        assert_equal 'COUNT(DISTINCT *)', @visitor.accept(function)
+        assert_equal 'COUNT(DISTINCT *)', compile(function)
 
         function = Nodes::Sum.new([Arel.star])
         function.distinct = true
-        assert_equal 'SUM(DISTINCT *)', @visitor.accept(function)
+        assert_equal 'SUM(DISTINCT *)', compile(function)
 
         function = Nodes::Max.new([Arel.star])
         function.distinct = true
-        assert_equal 'MAX(DISTINCT *)', @visitor.accept(function)
+        assert_equal 'MAX(DISTINCT *)', compile(function)
 
         function = Nodes::Min.new([Arel.star])
         function.distinct = true
-        assert_equal 'MIN(DISTINCT *)', @visitor.accept(function)
+        assert_equal 'MIN(DISTINCT *)', compile(function)
 
         function = Nodes::Avg.new([Arel.star])
         function.distinct = true
-        assert_equal 'AVG(DISTINCT *)', @visitor.accept(function)
+        assert_equal 'AVG(DISTINCT *)', compile(function)
       end
 
       it 'works with lists' do
         function = Nodes::NamedFunction.new('omg', [Arel.star, Arel.star])
-        assert_equal 'omg(*, *)', @visitor.accept(function)
+        assert_equal 'omg(*, *)', compile(function)
       end
 
       describe 'Nodes::Equality' do
         it "should escape strings" do
           test = Table.new(:users)[:name].eq 'Aaron Patterson'
-          @visitor.accept(test).must_be_like %{
+          compile(test).must_be_like %{
             "users"."name" = 'Aaron Patterson'
           }
         end
@@ -109,19 +109,19 @@ module Arel
         it 'should handle false' do
           table = Table.new(:users)
           val = Nodes.build_quoted(false, table[:active])
-          sql = @visitor.accept Nodes::Equality.new(val, val)
+          sql = compile Nodes::Equality.new(val, val)
           sql.must_be_like %{ 'f' = 'f' }
         end
 
         it 'should use the column to quote' do
           table = Table.new(:users)
           val = Nodes.build_quoted('1-fooo', table[:id])
-          sql = @visitor.accept Nodes::Equality.new(table[:id], val)
+          sql = compile Nodes::Equality.new(table[:id], val)
           sql.must_be_like %{ "users"."id" = 1 }
         end
 
         it 'should handle nil' do
-          sql = @visitor.accept Nodes::Equality.new(@table[:name], nil)
+          sql = compile Nodes::Equality.new(@table[:name], nil)
           sql.must_be_like %{ "users"."name" IS NULL }
         end
       end
@@ -129,13 +129,13 @@ module Arel
       describe 'Nodes::NotEqual' do
         it 'should handle false' do
           val = Nodes.build_quoted(false, @table[:active])
-          sql = @visitor.accept Nodes::NotEqual.new(@table[:active], val)
+          sql = compile Nodes::NotEqual.new(@table[:active], val)
           sql.must_be_like %{ "users"."active" != 'f' }
         end
 
         it 'should handle nil' do
           val = Nodes.build_quoted(nil, @table[:active])
-          sql = @visitor.accept Nodes::NotEqual.new(@table[:name], val)
+          sql = compile Nodes::NotEqual.new(@table[:name], val)
           sql.must_be_like %{ "users"."name" IS NOT NULL }
         end
       end
@@ -146,19 +146,19 @@ module Arel
           Class.new(Class.new(String)).new(":'("),
         ].each do |obj|
           val = Nodes.build_quoted(obj, @table[:active])
-          sql = @visitor.accept Nodes::NotEqual.new(@table[:name], val)
+          sql = compile Nodes::NotEqual.new(@table[:name], val)
           sql.must_be_like %{ "users"."name" != ':\\'(' }
         end
       end
 
       it "should visit_Class" do
-        @visitor.accept(Nodes.build_quoted(DateTime)).must_equal "'DateTime'"
+        compile(Nodes.build_quoted(DateTime)).must_equal "'DateTime'"
       end
 
       it "should escape LIMIT" do
         sc = Arel::Nodes::SelectStatement.new
         sc.limit = Arel::Nodes::Limit.new(Nodes.build_quoted("omg"))
-        assert_match(/LIMIT 'omg'/, @visitor.accept(sc))
+        assert_match(/LIMIT 'omg'/, compile(sc))
       end
 
       it "should visit_DateTime" do
@@ -173,7 +173,7 @@ module Arel
         dt = DateTime.now
         table = Table.new(:users)
         test = table[:created_at].eq dt
-        sql = @visitor.accept test
+        sql = compile test
 
         assert_equal "created_at", called_with.name
         sql.must_be_like %{"users"."created_at" = '#{dt.strftime("%Y-%m-%d %H:%M:%S")}'}
@@ -181,37 +181,37 @@ module Arel
 
       it "should visit_Float" do
         test = Table.new(:users)[:name].eq 2.14
-        sql = @visitor.accept test
+        sql = compile test
         sql.must_be_like %{"users"."name" = 2.14}
       end
 
       it "should visit_Not" do
-        sql = @visitor.accept Nodes::Not.new(Arel.sql("foo"))
+        sql = compile Nodes::Not.new(Arel.sql("foo"))
         sql.must_be_like "NOT (foo)"
       end
 
       it "should apply Not to the whole expression" do
         node = Nodes::And.new [@attr.eq(10), @attr.eq(11)]
-        sql = @visitor.accept Nodes::Not.new(node)
+        sql = compile Nodes::Not.new(node)
         sql.must_be_like %{NOT ("users"."id" = 10 AND "users"."id" = 11)}
       end
 
       it "should visit_As" do
         as = Nodes::As.new(Arel.sql("foo"), Arel.sql("bar"))
-        sql = @visitor.accept as
+        sql = compile as
         sql.must_be_like "foo AS bar"
       end
 
       it "should visit_Bignum" do
-        @visitor.accept 8787878092
+        compile 8787878092
       end
 
       it "should visit_Hash" do
-        @visitor.accept(Nodes.build_quoted({:a => 1}))
+        compile(Nodes.build_quoted({:a => 1}))
       end
 
       it "should visit_BigDecimal" do
-        @visitor.accept Nodes.build_quoted(BigDecimal.new('2.14'))
+        compile Nodes.build_quoted(BigDecimal.new('2.14'))
       end
 
       it "should visit_Date" do
@@ -226,31 +226,31 @@ module Arel
         dt = Date.today
         table = Table.new(:users)
         test = table[:created_at].eq dt
-        sql = @visitor.accept test
+        sql = compile test
 
         assert_equal "created_at", called_with.name
         sql.must_be_like %{"users"."created_at" = '#{dt.strftime("%Y-%m-%d")}'}
       end
 
       it "should visit_NilClass" do
-        @visitor.accept(Nodes.build_quoted(nil)).must_be_like "NULL"
+        compile(Nodes.build_quoted(nil)).must_be_like "NULL"
       end
 
       it "should visit_Arel_SelectManager, which is a subquery" do
         mgr = Table.new(:foo).project(:bar)
-        @visitor.accept(mgr).must_be_like '(SELECT bar FROM "foo")'
+        compile(mgr).must_be_like '(SELECT bar FROM "foo")'
       end
 
       it "should visit_Arel_Nodes_And" do
         node = Nodes::And.new [@attr.eq(10), @attr.eq(11)]
-        @visitor.accept(node).must_be_like %{
+        compile(node).must_be_like %{
           "users"."id" = 10 AND "users"."id" = 11
         }
       end
 
       it "should visit_Arel_Nodes_Or" do
         node = Nodes::Or.new @attr.eq(10), @attr.eq(11)
-        @visitor.accept(node).must_be_like %{
+        compile(node).must_be_like %{
           "users"."id" = 10 OR "users"."id" = 11
         }
       end
@@ -261,25 +261,25 @@ module Arel
             Nodes::UnqualifiedColumn.new(column),
             Nodes::UnqualifiedColumn.new(column)
           )
-        @visitor.accept(node).must_be_like %{
+        compile(node).must_be_like %{
 	  "id" = "id"
 	}
       end
 
       it "should visit visit_Arel_Attributes_Time" do
         attr = Attributes::Time.new(@attr.relation, @attr.name)
-        @visitor.accept attr
+        compile attr
       end
 
       it "should visit_TrueClass" do
         test = Table.new(:users)[:bool].eq(true)
-        @visitor.accept(test).must_be_like %{ "users"."bool" = 't' }
+        compile(test).must_be_like %{ "users"."bool" = 't' }
       end
 
       describe "Nodes::Matches" do
         it "should know how to visit" do
           node = @table[:name].matches('foo%')
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."name" LIKE 'foo%'
           }
         end
@@ -287,7 +287,7 @@ module Arel
         it 'can handle subqueries' do
           subquery = @table.project(:id).where(@table[:name].matches('foo%'))
           node = @attr.in subquery
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" LIKE 'foo%')
           }
         end
@@ -296,7 +296,7 @@ module Arel
       describe "Nodes::DoesNotMatch" do
         it "should know how to visit" do
           node = @table[:name].does_not_match('foo%')
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."name" NOT LIKE 'foo%'
           }
         end
@@ -304,7 +304,7 @@ module Arel
         it 'can handle subqueries' do
           subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
           node = @attr.in subquery
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT LIKE 'foo%')
           }
         end
@@ -313,7 +313,7 @@ module Arel
       describe "Nodes::Ordering" do
         it "should know how to visit" do
           node = @attr.desc
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" DESC
           }
         end
@@ -322,19 +322,19 @@ module Arel
       describe "Nodes::In" do
         it "should know how to visit" do
           node = @attr.in [1, 2, 3]
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" IN (1, 2, 3)
           }
         end
 
         it "should return 1=0 when empty right which is always false" do
           node = @attr.in []
-          @visitor.accept(node).must_equal '1=0'
+          compile(node).must_equal '1=0'
         end
 
         it 'can handle two dot ranges' do
           node = @attr.in 1..3
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" BETWEEN 1 AND 3
           }
         end
@@ -348,26 +348,26 @@ module Arel
 
         it 'can handle ranges bounded by infinity' do
           node = @attr.in 1..Float::INFINITY
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" >= 1
           }
           node = @attr.in(-Float::INFINITY..3)
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" <= 3
           }
           node = @attr.in(-Float::INFINITY...3)
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" < 3
           }
           node = @attr.in(-Float::INFINITY..Float::INFINITY)
-          @visitor.accept(node).must_be_like %{1=1}
+          compile(node).must_be_like %{1=1}
         end
 
         it 'can handle subqueries' do
           table = Table.new(:users)
           subquery = table.project(:id).where(table[:name].eq('Aaron'))
           node = @attr.in subquery
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" = 'Aaron')
           }
         end
@@ -388,29 +388,29 @@ module Arel
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }
-          visitor.accept(in_node).must_equal %("users"."name" IN ('a', 'b', 'c'))
+          visitor.accept(in_node, Collectors::SQLString.new).value.must_equal %("users"."name" IN ('a', 'b', 'c'))
         end
       end
 
       describe "Nodes::InfixOperation" do
         it "should handle Multiplication" do
           node = Arel::Attributes::Decimal.new(Table.new(:products), :price) * Arel::Attributes::Decimal.new(Table.new(:currency_rates), :rate)
-          @visitor.accept(node).must_equal %("products"."price" * "currency_rates"."rate")
+          compile(node).must_equal %("products"."price" * "currency_rates"."rate")
         end
 
         it "should handle Division" do
           node = Arel::Attributes::Decimal.new(Table.new(:products), :price) / 5
-          @visitor.accept(node).must_equal %("products"."price" / 5)
+          compile(node).must_equal %("products"."price" / 5)
         end
 
         it "should handle Addition" do
           node = Arel::Attributes::Decimal.new(Table.new(:products), :price) + 6
-          @visitor.accept(node).must_equal %(("products"."price" + 6))
+          compile(node).must_equal %(("products"."price" + 6))
         end
 
         it "should handle Subtraction" do
           node = Arel::Attributes::Decimal.new(Table.new(:products), :price) - 7
-          @visitor.accept(node).must_equal %(("products"."price" - 7))
+          compile(node).must_equal %(("products"."price" - 7))
         end
 
         it "should handle arbitrary operators" do
@@ -419,7 +419,7 @@ module Arel
             Arel::Attributes::String.new(Table.new(:products), :name),
             Arel::Attributes::String.new(Table.new(:products), :name)
           )
-          @visitor.accept(node).must_equal %("products"."name" || "products"."name")
+          compile(node).must_equal %("products"."name" || "products"."name")
         end
       end
 
@@ -438,7 +438,7 @@ module Arel
 
         it 'can handle two dot ranges' do
           node = @attr.not_in 1..3
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" < 1 OR "users"."id" > 3
           }
         end
@@ -456,15 +456,15 @@ module Arel
             "users"."id" < 1
           }
           node = @attr.not_in(-Float::INFINITY..3)
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" > 3
           }
           node = @attr.not_in(-Float::INFINITY...3)
-          @visitor.accept(node).must_be_like %{
+          compile(node).must_be_like %{
             "users"."id" >= 3
           }
           node = @attr.not_in(-Float::INFINITY..Float::INFINITY)
-          @visitor.accept(node).must_be_like %{1=0}
+          compile(node).must_be_like %{1=0}
         end
 
         it 'can handle subqueries' do
@@ -492,7 +492,7 @@ module Arel
           visitor.expected = Table.engine.connection.columns(:users).find { |x|
             x.name == 'name'
           }
-          visitor.accept(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
+          compile(in_node).must_equal %("users"."name" NOT IN ('a', 'b', 'c'))
         end
       end