arel 5.0.1.20140414130214 → 6.0.0.beta1

data/test/visitors/test_bind_visitor.rb

@@ -4,8 +4,14 @@ require 'support/fake_record'
 
 module Arel
   module Visitors
-    class TestBindVisitor < Minitest::Test
-      
+    class TestBindVisitor < Arel::Test
+      attr_reader :collector
+
+      def setup
+        @collector = Collectors::SQLString.new
+        super
+      end
+
       ##
       # Tests visit_Arel_Nodes_Assignment correctly
       # substitutes binds with values from block
@@ -19,12 +25,16 @@ module Arel
         }.new Table.engine.connection
 
         assignment = um.ast.values[0]
-        actual = visitor.accept(assignment) { "replace" } 
-        actual.must_be_like "\"name\" = replace"
+        actual = visitor.accept(assignment, collector) {
+          "replace"
+        }
+        assert actual
+        value = actual.value
+        assert_like "\"name\" = replace", value
       end
 
       def test_visitor_yields_on_binds
-        visitor = Class.new(Arel::Visitors::Visitor) {
+        visitor = Class.new(Arel::Visitors::ToSql) {
           def initialize omg
           end
 
@@ -33,12 +43,12 @@ module Arel
 
         bp = Nodes::BindParam.new 'omg'
         called = false
-        visitor.accept(bp) { called = true }
+        visitor.accept(bp, collector) { called = true }
         assert called
       end
 
       def test_visitor_only_yields_on_binds
-        visitor = Class.new(Arel::Visitors::Visitor) {
+        visitor = Class.new(Arel::Visitors::ToSql) {
           def initialize omg
           end
 
@@ -48,9 +58,7 @@ module Arel
         bp = Arel.sql 'omg'
         called = false
 
-        assert_raises(TypeError) {
-          visitor.accept(bp) { called = true }
-        }
+        visitor.accept(bp, collector) { called = true }
         refute called
       end
     end

data/test/visitors/test_depth_first.rb

@@ -81,12 +81,24 @@ module Arel
         assert_equal [:a, :b, join], @collector.calls
       end
 
+      def test_full_outer_join
+        join = Nodes::FullOuterJoin.new :a, :b
+        @visitor.accept join
+        assert_equal [:a, :b, join], @collector.calls
+      end
+
       def test_outer_join
         join = Nodes::OuterJoin.new :a, :b
         @visitor.accept join
         assert_equal [:a, :b, join], @collector.calls
       end
 
+      def test_right_outer_join
+        join = Nodes::RightOuterJoin.new :a, :b
+        @visitor.accept join
+        assert_equal [:a, :b, join], @collector.calls
+      end
+
       [
         Arel::Nodes::Assignment,
         Arel::Nodes::Between,

data/test/visitors/test_dot.rb

@@ -17,13 +17,13 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           op = klass.new(:a, "z")
-          @visitor.accept op
+          @visitor.accept op, Collectors::PlainString.new
         end
       end
 
       def test_named_function
         func = Nodes::NamedFunction.new 'omg', 'omg'
-        @visitor.accept func
+        @visitor.accept func, Collectors::PlainString.new
       end
 
       # unary ops
@@ -41,7 +41,7 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           op = klass.new(:a)
-          @visitor.accept op
+          @visitor.accept op, Collectors::PlainString.new
         end
       end
 
@@ -68,7 +68,7 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           binary = klass.new(:a, :b)
-          @visitor.accept binary
+          @visitor.accept binary, Collectors::PlainString.new
         end
       end
     end

data/test/visitors/test_ibm_db.rb

@@ -7,19 +7,25 @@ module Arel
         @visitor = IBM_DB.new Table.engine.connection
       end
 
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
+      end
+
       it 'uses FETCH FIRST n ROWS to limit results' do
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(1)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT FETCH FIRST 1 ROWS ONLY"
       end
 
       it 'uses FETCH FIRST n ROWS in updates with a limit' do
+        table = Table.new(:users)
         stmt = Nodes::UpdateStatement.new
-        stmt.limit = Nodes::Limit.new(1)
-        stmt.key = 'id'
-        sql = @visitor.accept(stmt)
-        sql.must_be_like "UPDATE NULL WHERE 'id' IN (SELECT 'id' FETCH FIRST 1 ROWS ONLY)"
+        stmt.relation = table
+        stmt.limit = Nodes::Limit.new(Nodes.build_quoted(1))
+        stmt.key = table[:id]
+        sql = compile(stmt)
+        sql.must_be_like "UPDATE \"users\" WHERE \"users\".\"id\" IN (SELECT \"users\".\"id\" FROM \"users\" FETCH FIRST 1 ROWS ONLY)"
       end
 
     end

data/test/visitors/test_informix.rb

@@ -7,25 +7,31 @@ module Arel
         @visitor = Informix.new Table.engine.connection
       end
 
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
+      end
+
       it 'uses LIMIT n to limit results' do
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(1)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT LIMIT 1"
       end
 
       it 'uses LIMIT n in updates with a limit' do
+        table = Table.new(:users)
         stmt = Nodes::UpdateStatement.new
-        stmt.limit = Nodes::Limit.new(1)
-        stmt.key = 'id'
-        sql = @visitor.accept(stmt)
-        sql.must_be_like "UPDATE NULL WHERE 'id' IN (SELECT LIMIT 1 'id')"
+        stmt.relation = table
+        stmt.limit = Nodes::Limit.new(Nodes.build_quoted(1))
+        stmt.key = table[:id]
+        sql = compile(stmt)
+        sql.must_be_like "UPDATE \"users\" WHERE \"users\".\"id\" IN (SELECT LIMIT 1 \"users\".\"id\" FROM \"users\")"
       end
 
       it 'uses SKIP n to jump results' do
         stmt = Nodes::SelectStatement.new
         stmt.offset = Nodes::Offset.new(10)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT SKIP 10"
       end
 
@@ -33,7 +39,7 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(1)
         stmt.offset = Nodes::Offset.new(1)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT SKIP 1 LIMIT 1"
       end
 
@@ -43,7 +49,7 @@ module Arel
         core.source = Nodes::JoinSource.new(table, [table.create_join(Table.new(:comments))])
 
         stmt = Nodes::SelectStatement.new([core])
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like 'SELECT FROM "posts" INNER JOIN "comments"'
       end
 

data/test/visitors/test_mssql.rb

@@ -8,9 +8,13 @@ module Arel
         @table = Arel::Table.new "users"
       end
 
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
+      end
+
       it 'should not modify query if no offset or limit' do
         stmt = Nodes::SelectStatement.new
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT"
       end
 
@@ -18,15 +22,15 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.cores.first.from = @table
         stmt.limit = Nodes::Limit.new(10)
-        sql = @visitor.accept(stmt)
-        sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY \"users\".\"id\") as _row_num FROM \"users\" ) as _t WHERE _row_num BETWEEN 1 AND 10"
+        sql = compile(stmt)
+        sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY \"users\".\"id\") as _row_num FROM \"users\") as _t WHERE _row_num BETWEEN 1 AND 10"
       end
 
       it 'should go over query ORDER BY if .order()' do
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(10)
         stmt.orders << Nodes::SqlLiteral.new('order_by')
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY order_by) as _row_num) as _t WHERE _row_num BETWEEN 1 AND 10"
       end
 
@@ -34,7 +38,7 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.cores.first.groups << Nodes::SqlLiteral.new('group_by')
         stmt.limit = Nodes::Limit.new(10)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY group_by) as _row_num GROUP BY group_by) as _t WHERE _row_num BETWEEN 1 AND 10"
       end
 
@@ -42,14 +46,14 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(10)
         stmt.offset = Nodes::Offset.new(20)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY ) as _row_num) as _t WHERE _row_num BETWEEN 21 AND 30"
       end
 
       it 'should use >= if only .offset' do
         stmt = Nodes::SelectStatement.new
         stmt.offset = Nodes::Offset.new(20)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY ) as _row_num) as _t WHERE _row_num >= 21"
       end
 
@@ -57,7 +61,7 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.limit = Nodes::Limit.new(10)
         stmt.cores.first.projections << Nodes::Count.new('*')
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT COUNT(1) as count_id FROM (SELECT _t.* FROM (SELECT ROW_NUMBER() OVER (ORDER BY ) as _row_num) as _t WHERE _row_num BETWEEN 1 AND 10) AS subquery"
       end
 

data/test/visitors/test_mysql.rb

@@ -7,14 +7,18 @@ module Arel
         @visitor = MySQL.new Table.engine.connection
       end
 
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
+      end
+
       it 'squashes parenthesis on multiple unions' do
-        subnode = Nodes::Union.new 'left', 'right'
-        node    = Nodes::Union.new subnode, 'topright'
-        assert_equal 1, @visitor.accept(node).scan('(').length
+        subnode = Nodes::Union.new Arel.sql('left'), Arel.sql('right')
+        node    = Nodes::Union.new subnode, Arel.sql('topright')
+        assert_equal 1, compile(node).scan('(').length
 
-        subnode = Nodes::Union.new 'left', 'right'
-        node    = Nodes::Union.new 'topleft', subnode
-        assert_equal 1, @visitor.accept(node).scan('(').length
+        subnode = Nodes::Union.new Arel.sql('left'), Arel.sql('right')
+        node    = Nodes::Union.new Arel.sql('topleft'), subnode
+        assert_equal 1, compile(node).scan('(').length
       end
 
       ###
@@ -23,31 +27,32 @@ module Arel
       it 'defaults limit to 18446744073709551615' do
         stmt = Nodes::SelectStatement.new
         stmt.offset = Nodes::Offset.new(1)
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT FROM DUAL LIMIT 18446744073709551615 OFFSET 1"
       end
 
       it "should escape LIMIT" do
         sc = Arel::Nodes::UpdateStatement.new
-        sc.limit = Nodes::Limit.new("omg")
-        assert_equal("UPDATE NULL LIMIT 'omg'", @visitor.accept(sc))
+        sc.relation = Table.new(:users)
+        sc.limit = Nodes::Limit.new(Nodes.build_quoted("omg"))
+        assert_equal("UPDATE \"users\" LIMIT 'omg'", compile(sc))
       end
 
       it 'uses DUAL for empty from' do
         stmt = Nodes::SelectStatement.new
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like "SELECT FROM DUAL"
       end
 
       describe 'locking' do
         it 'defaults to FOR UPDATE when locking' do
           node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
-          @visitor.accept(node).must_be_like "FOR UPDATE"
+          compile(node).must_be_like "FOR UPDATE"
         end
 
         it 'allows a custom string to be used as a lock' do
           node = Nodes::Lock.new(Arel.sql('LOCK IN SHARE MODE'))
-          @visitor.accept(node).must_be_like "LOCK IN SHARE MODE"
+          compile(node).must_be_like "LOCK IN SHARE MODE"
         end
       end
     end

data/test/visitors/test_oracle.rb

@@ -7,13 +7,17 @@ module Arel
         @visitor = Oracle.new Table.engine.connection_pool
       end
 
+      def compile node
+        @visitor.accept(node, Collectors::SQLString.new).value
+      end
+
       it 'modifies order when there is distinct and first value' do
         # *sigh*
         select = "DISTINCT foo.id, FIRST_VALUE(projects.name) OVER (foo) AS alias_0__"
         stmt = Nodes::SelectStatement.new
         stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
         stmt.orders << Nodes::SqlLiteral.new('foo')
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like %{
           SELECT #{select} ORDER BY alias_0__
         }
@@ -26,8 +30,8 @@ module Arel
         stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
         stmt.orders << Nodes::SqlLiteral.new('foo')
 
-        sql = @visitor.accept(stmt)
-        sql2 = @visitor.accept(stmt)
+        sql = compile(stmt)
+        sql2 = compile(stmt)
         sql.must_equal sql2
       end
 
@@ -37,7 +41,7 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
         stmt.orders << Nodes::SqlLiteral.new('foo, bar')
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like %{
           SELECT #{select} ORDER BY alias_0__, alias_1__
         }
@@ -49,7 +53,7 @@ module Arel
         stmt = Nodes::SelectStatement.new
         stmt.cores.first.projections << Nodes::SqlLiteral.new(select)
         stmt.orders << Nodes::SqlLiteral.new('NVL(LOWER(bar, foo), foo) DESC, UPPER(baz)')
-        sql = @visitor.accept(stmt)
+        sql = compile(stmt)
         sql.must_be_like %{
           SELECT #{select} ORDER BY alias_0__ DESC, alias_1__
         }
@@ -60,7 +64,7 @@ module Arel
           it 'adds a rownum clause' do
             stmt = Nodes::SelectStatement.new
             stmt.limit = Nodes::Limit.new(10)
-            sql = @visitor.accept stmt
+            sql = compile stmt
             sql.must_be_like %{ SELECT WHERE ROWNUM <= 10 }
           end
 
@@ -68,8 +72,8 @@ module Arel
             stmt = Nodes::SelectStatement.new
             stmt.orders << Nodes::SqlLiteral.new('foo')
             stmt.limit = Nodes::Limit.new(10)
-            sql = @visitor.accept stmt
-            sql2 = @visitor.accept stmt
+            sql = compile stmt
+            sql2 = compile stmt
             sql.must_equal sql2
           end
 
@@ -77,9 +81,9 @@ module Arel
             stmt = Nodes::SelectStatement.new
             stmt.orders << Nodes::SqlLiteral.new('foo')
             stmt.limit = Nodes::Limit.new(10)
-            sql = @visitor.accept stmt
+            sql = compile stmt
             sql.must_be_like %{
-              SELECT * FROM (SELECT ORDER BY foo) WHERE ROWNUM <= 10
+              SELECT * FROM (SELECT ORDER BY foo ) WHERE ROWNUM <= 10
             }
           end
 
@@ -88,21 +92,21 @@ module Arel
             stmt.cores.first.set_quantifier = Arel::Nodes::Distinct.new
             stmt.cores.first.projections << Nodes::SqlLiteral.new('id')
             stmt.limit = Arel::Nodes::Limit.new(10)
-            sql = @visitor.accept stmt
+            sql = compile stmt
             sql.must_be_like %{
-              SELECT * FROM (SELECT DISTINCT id) WHERE ROWNUM <= 10
+              SELECT * FROM (SELECT DISTINCT id ) WHERE ROWNUM <= 10
             }
           end
 
           it 'creates a different subquery when there is an offset' do
             stmt = Nodes::SelectStatement.new
-            stmt.limit = Nodes::Limit.new(10)
+            stmt.limit = Nodes::Limit.new(Nodes.build_quoted(10))
             stmt.offset = Nodes::Offset.new(10)
-            sql = @visitor.accept stmt
+            sql = compile stmt
             sql.must_be_like %{
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
-                FROM (SELECT) raw_sql_
+                FROM (SELECT ) raw_sql_
                  WHERE rownum <= 20
               )
               WHERE raw_rnum_ > 10
@@ -111,10 +115,10 @@ module Arel
 
           it 'is idempotent with different subquery' do
             stmt = Nodes::SelectStatement.new
-            stmt.limit = Nodes::Limit.new(10)
+            stmt.limit = Nodes::Limit.new(Nodes.build_quoted(10))
             stmt.offset = Nodes::Offset.new(10)
-            sql = @visitor.accept stmt
-            sql2 = @visitor.accept stmt
+            sql = compile stmt
+            sql2 = compile stmt
             sql.must_equal sql2
           end
         end
@@ -123,7 +127,7 @@ module Arel
           it 'creates a select from subquery with rownum condition' do
             stmt = Nodes::SelectStatement.new
             stmt.offset = Nodes::Offset.new(10)
-            sql = @visitor.accept stmt
+            sql = compile stmt
             sql.must_be_like %{
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
@@ -139,7 +143,7 @@ module Arel
       it 'modified except to be minus' do
         left = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 10")
         right = Nodes::SqlLiteral.new("SELECT * FROM users WHERE age > 20")
-        sql = @visitor.accept Nodes::Except.new(left, right)
+        sql = compile Nodes::Except.new(left, right)
         sql.must_be_like %{
           ( SELECT * FROM users WHERE age > 10 MINUS SELECT * FROM users WHERE age > 20 )
         }
@@ -148,7 +152,7 @@ module Arel
       describe 'locking' do
         it 'defaults to FOR UPDATE when locking' do
           node = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
-          @visitor.accept(node).must_be_like "FOR UPDATE"
+          compile(node).must_be_like "FOR UPDATE"
         end
       end
     end