arel 3.0.3 → 4.0.0.beta1

data/test/nodes/test_sql_literal.rb

@@ -31,6 +31,16 @@ module Arel
           node = SqlLiteral.new('foo').eq(1)
           @visitor.accept(node).must_be_like %{ foo = 1 }
         end
+
+        it 'is equal with equal contents' do
+          array = [SqlLiteral.new('foo'), SqlLiteral.new('foo')]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different contents' do
+          array = [SqlLiteral.new('foo'), SqlLiteral.new('bar')]
+          assert_equal 2, array.uniq.size
+        end
       end
 
       describe 'grouped "or" equality' do

data/test/nodes/test_sum.rb

@@ -9,4 +9,16 @@ describe Arel::Nodes::Sum do
       }
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      array = [Arel::Nodes::Sum.new('foo'), Arel::Nodes::Sum.new('foo')]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      array = [Arel::Nodes::Sum.new('foo'), Arel::Nodes::Sum.new('foo!')]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

data/test/nodes/test_table_alias.rb

@@ -0,0 +1,36 @@
+require 'helper'
+require 'ostruct'
+
+module Arel
+  module Nodes
+    describe 'table alias' do
+      it 'has an #engine which delegates to the relation' do
+        engine   = 'vroom'
+        relation = Table.new(:users, engine)
+
+        node = TableAlias.new relation, :foo
+        node.engine.must_equal engine
+      end
+
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          relation1 = Table.new(:users, 'vroom')
+          node1     = TableAlias.new relation1, :foo
+          relation2 = Table.new(:users, 'vroom')
+          node2     = TableAlias.new relation2, :foo
+          array = [node1, node2]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          relation1 = Table.new(:users, 'vroom')
+          node1     = TableAlias.new relation1, :foo
+          relation2 = Table.new(:users, 'vroom')
+          node2     = TableAlias.new relation2, :bar
+          array = [node1, node2]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+  end
+end

data/test/nodes/test_true.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'True' do
+      describe 'equality' do
+        it 'is equal to other true nodes' do
+          array = [True.new, True.new]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with other nodes' do
+          array = [True.new, Node.new]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+  end
+end
+
+

data/test/nodes/test_update_statement.rb

@@ -15,4 +15,44 @@ describe Arel::Nodes::UpdateStatement do
       dolly.values.wont_be_same_as statement.values
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      statement1 = Arel::Nodes::UpdateStatement.new
+      statement1.relation = 'zomg'
+      statement1.wheres   = 2
+      statement1.values   = false
+      statement1.orders   = %w[x y z]
+      statement1.limit    = 42
+      statement1.key      = 'zomg'
+      statement2 = Arel::Nodes::UpdateStatement.new
+      statement2.relation = 'zomg'
+      statement2.wheres   = 2
+      statement2.values   = false
+      statement2.orders   = %w[x y z]
+      statement2.limit    = 42
+      statement2.key      = 'zomg'
+      array = [statement1, statement2]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      statement1 = Arel::Nodes::UpdateStatement.new
+      statement1.relation = 'zomg'
+      statement1.wheres   = 2
+      statement1.values   = false
+      statement1.orders   = %w[x y z]
+      statement1.limit    = 42
+      statement1.key      = 'zomg'
+      statement2 = Arel::Nodes::UpdateStatement.new
+      statement2.relation = 'zomg'
+      statement2.wheres   = 2
+      statement2.values   = false
+      statement2.orders   = %w[x y z]
+      statement2.limit    = 42
+      statement2.key      = 'wth'
+      array = [statement1, statement2]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

data/test/nodes/test_window.rb

@@ -0,0 +1,73 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'Window' do
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          window1 = Window.new
+          window1.orders = [1, 2]
+          window1.frame 3
+          window2 = Window.new
+          window2.orders = [1, 2]
+          window2.frame 3
+          array = [window1, window2]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          window1 = Window.new
+          window1.orders = [1, 2]
+          window1.frame 3
+          window2 = Window.new
+          window2.orders = [1, 2]
+          window2.frame 4
+          array = [window1, window2]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+
+    describe 'NamedWindow' do
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          window1 = NamedWindow.new 'foo'
+          window1.orders = [1, 2]
+          window1.frame 3
+          window2 = NamedWindow.new 'foo'
+          window2.orders = [1, 2]
+          window2.frame 3
+          array = [window1, window2]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          window1 = NamedWindow.new 'foo'
+          window1.orders = [1, 2]
+          window1.frame 3
+          window2 = NamedWindow.new 'bar'
+          window2.orders = [1, 2]
+          window2.frame 3
+          array = [window1, window2]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+
+    describe 'CurrentRow' do
+      describe 'equality' do
+        it 'is equal to other current row nodes' do
+          array = [CurrentRow.new, CurrentRow.new]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with other nodes' do
+          array = [CurrentRow.new, Node.new]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+  end
+end
+
+

data/test/test_attributes.rb

@@ -10,6 +10,18 @@ module Arel
       assert_equal [attribute], node.expressions
     end
 
+    describe 'equality' do
+      it 'is equal with equal ivars' do
+        array = [Attribute.new('foo', 'bar'), Attribute.new('foo', 'bar')]
+        assert_equal 1, array.uniq.size
+      end
+
+      it 'is not equal with different ivars' do
+        array = [Attribute.new('foo', 'bar'), Attribute.new('foo', 'baz')]
+        assert_equal 2, array.uniq.size
+      end
+    end
+
     describe 'for' do
       it 'deals with unknown column types' do
         column = Struct.new(:type).new :crazy

data/test/test_insert_manager.rb

@@ -10,7 +10,6 @@ module Arel
 
     describe 'insert' do
       it 'can create a Values node' do
-        table   = Table.new(:users)
         manager = Arel::InsertManager.new Table.engine
         values  = manager.create_values %w{ a b }, %w{ c d }
 
@@ -20,7 +19,6 @@ module Arel
       end
 
       it 'allows sql literals' do
-        table          = Table.new(:users)
         manager        = Arel::InsertManager.new Table.engine
         manager.values = manager.create_values [Arel.sql('*')], %w{ a }
         manager.to_sql.must_be_like %{

data/test/test_select_manager.rb

@@ -119,7 +119,7 @@ module Arel
           manager = Arel::SelectManager.new Table.engine
           manager.project Arel.sql('name')
           manager.from as
-          manager.to_sql.must_be_like "SELECT name FROM (SELECT * FROM zomg ) foo"
+          manager.to_sql.must_be_like "SELECT name FROM (SELECT * FROM zomg) foo"
         end
       end
 
@@ -147,7 +147,7 @@ module Arel
           manager1.from(as)
 
           manager1.to_sql.must_be_like %{
-            SELECT lol FROM (SELECT * FROM "users" ) omg
+            SELECT lol FROM (SELECT * FROM "users") omg
           }
         end
       end
@@ -672,7 +672,6 @@ module Arel
       end
 
       it 'returns string join sql' do
-        table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
         manager.from Nodes::StringJoin.new('hello')
         manager.join_sql.must_be_like %{ 'hello' }
@@ -1033,6 +1032,14 @@ module Arel
       end
     end
 
+    describe 'projections' do
+      it 'reads projections' do
+        manager = Arel::SelectManager.new Table.engine
+        manager.project Arel.sql('foo'), Arel.sql('bar')
+        manager.projections.must_equal [Arel.sql('foo'), Arel.sql('bar')]
+      end
+    end
+
     describe 'projections=' do
       it 'overwrites projections' do
         manager = Arel::SelectManager.new Table.engine
@@ -1132,7 +1139,6 @@ module Arel
 
     describe 'source' do
       it 'returns the join source of the select core' do
-        table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
         manager.source.must_equal manager.ast.cores.last.source
       end
@@ -1140,7 +1146,6 @@ module Arel
 
     describe 'distinct' do
       it 'sets the quantifier' do
-        table   = Table.new :users
         manager = Arel::SelectManager.new Table.engine
 
         manager.distinct

data/test/test_table.rb

@@ -180,5 +180,29 @@ module Arel
         end
       end
     end
+
+    describe 'equality' do
+      it 'is equal with equal ivars' do
+        relation1 = Table.new(:users, 'vroom')
+        relation1.aliases     = %w[a b c]
+        relation1.table_alias = 'zomg'
+        relation2 = Table.new(:users, 'vroom')
+        relation2.aliases     = %w[a b c]
+        relation2.table_alias = 'zomg'
+        array = [relation1, relation2]
+        assert_equal 1, array.uniq.size
+      end
+
+      it 'is not equal with different ivars' do
+        relation1 = Table.new(:users, 'vroom')
+        relation1.aliases     = %w[a b c]
+        relation1.table_alias = 'zomg'
+        relation2 = Table.new(:users, 'vroom')
+        relation2.aliases     = %w[x y z]
+        relation2.table_alias = 'zomg'
+        array = [relation1, relation2]
+        assert_equal 2, array.uniq.size
+      end
+    end
   end
 end

data/test/test_update_manager.rb

@@ -8,6 +8,14 @@ module Arel
       end
     end
 
+    it "should not quote sql literals" do
+      table = Table.new(:users)
+      um = Arel::UpdateManager.new Table.engine
+      um.table table
+      um.set [[table[:name], (Arel::Nodes::BindParam.new '?')]]
+      um.to_sql.must_be_like %{ UPDATE "users" SET "name" =  ? }
+    end
+
     it 'handles limit properly' do
       table = Table.new(:users)
       um = Arel::UpdateManager.new Table.engine

data/test/visitors/test_bind_visitor.rb

@@ -1,9 +1,28 @@
 require 'helper'
 require 'arel/visitors/bind_visitor'
+require 'support/fake_record'
 
 module Arel
   module Visitors
-    class TestBindVisitor < MiniTest::Unit::TestCase
+    class TestBindVisitor < MiniTest::Unit::TestCase 
+      
+      ##
+      # Tests visit_Arel_Nodes_Assignment correctly
+      # substitutes binds with values from block
+      def test_assignment_binds_are_substituted
+        table = Table.new(:users)
+        um = Arel::UpdateManager.new Table.engine
+        bp = Nodes::BindParam.new '?'
+        um.set [[table[:name], bp]]
+        visitor = Class.new(Arel::Visitors::ToSql) {
+          include Arel::Visitors::BindVisitor
+        }.new Table.engine.connection
+
+        assignment = um.ast.values[0]
+        actual = visitor.accept(assignment) { "replace" } 
+        actual.must_be_like "\"name\" = replace"
+      end
+
       def test_visitor_yields_on_binds
         visitor = Class.new(Arel::Visitors::Visitor) {
           def initialize omg

data/test/visitors/test_oracle.rb

@@ -102,9 +102,8 @@ module Arel
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (SELECT) raw_sql_
-                 WHERE rownum <= 20
               )
-              WHERE raw_rnum_ > 10
+              WHERE raw_rnum_ >= 11 and rownum <= 10
             }
           end
 

data/test/visitors/test_to_sql.rb

@@ -48,6 +48,45 @@ module Arel
         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)
+
+        function = Nodes::Sum.new([Arel.star])
+        assert_equal 'SUM(*)', @visitor.accept(function)
+
+        function = Nodes::Max.new([Arel.star])
+        assert_equal 'MAX(*)', @visitor.accept(function)
+
+        function = Nodes::Min.new([Arel.star])
+        assert_equal 'MIN(*)', @visitor.accept(function)
+
+        function = Nodes::Avg.new([Arel.star])
+        assert_equal 'AVG(*)', @visitor.accept(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)
+
+        function = Nodes::Sum.new([Arel.star])
+        function.distinct = true
+        assert_equal 'SUM(DISTINCT *)', @visitor.accept(function)
+
+        function = Nodes::Max.new([Arel.star])
+        function.distinct = true
+        assert_equal 'MAX(DISTINCT *)', @visitor.accept(function)
+
+        function = Nodes::Min.new([Arel.star])
+        function.distinct = true
+        assert_equal 'MIN(DISTINCT *)', @visitor.accept(function)
+
+        function = Nodes::Avg.new([Arel.star])
+        function.distinct = true
+        assert_equal 'AVG(DISTINCT *)', @visitor.accept(function)
+      end
+
       it 'works with lists' do
         function = Nodes::NamedFunction.new('omg', [Arel.star, Arel.star])
         assert_equal 'omg(*, *)', @visitor.accept(function)
@@ -126,6 +165,11 @@ module Arel
         @visitor.accept(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")'
+      end
+
       it "should visit_Arel_Nodes_And" do
         node = Nodes::And.new [@attr.eq(10), @attr.eq(11)]
         @visitor.accept(node).must_be_like %{