arel 3.0.3 → 4.0.0

data/test/nodes/test_extract.rb

@@ -16,4 +16,18 @@ describe Arel::Nodes::Extract do
       }
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      table = Arel::Table.new :users
+      array = [table[:attr].extract('foo'), table[:attr].extract('foo')]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      table = Arel::Table.new :users
+      array = [table[:attr].extract('foo'), table[:attr].extract('bar')]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

data/test/nodes/test_false.rb

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

data/test/nodes/test_grouping.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+module Arel
+  module Nodes
+    describe 'Grouping' do
+      it 'should create Equality nodes' do
+        grouping = Grouping.new('foo')
+        grouping.eq('foo').to_sql.must_be_like %q{('foo') = 'foo'}
+      end
+
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          array = [Grouping.new('foo'), Grouping.new('foo')]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          array = [Grouping.new('foo'), Grouping.new('bar')]
+          assert_equal 2, array.uniq.size
+        end
+      end
+    end
+  end
+end
+

data/test/nodes/test_infix_operation.rb

@@ -25,6 +25,16 @@ module Arel
         assert_equal operation, ordering.expr
         assert ordering.descending?
       end
+
+      def test_equality_with_same_ivars
+        array = [InfixOperation.new(:+, 1, 2), InfixOperation.new(:+, 1, 2)]
+        assert_equal 1, array.uniq.size
+      end
+
+      def test_inequality_with_different_ivars
+        array = [InfixOperation.new(:+, 1, 2), InfixOperation.new(:+, 1, 3)]
+        assert_equal 2, array.uniq.size
+      end
     end
   end
 end

data/test/nodes/test_insert_statement.rb

@@ -15,4 +15,28 @@ describe Arel::Nodes::InsertStatement do
       dolly.values.wont_be_same_as statement.values
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      statement1 = Arel::Nodes::InsertStatement.new
+      statement1.columns = %w[a b c]
+      statement1.values  = %w[x y z]
+      statement2 = Arel::Nodes::InsertStatement.new
+      statement2.columns = %w[a b c]
+      statement2.values  = %w[x y z]
+      array = [statement1, statement2]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      statement1 = Arel::Nodes::InsertStatement.new
+      statement1.columns = %w[a b c]
+      statement1.values  = %w[x y z]
+      statement2 = Arel::Nodes::InsertStatement.new
+      statement2.columns = %w[a b c]
+      statement2.values  = %w[1 2 3]
+      array = [statement1, statement2]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

data/test/nodes/test_named_function.rb

@@ -25,6 +25,22 @@ module Arel
         assert_kind_of SqlLiteral, function.alias
         assert_equal 'wth', function.alias
       end
+
+      def test_equality_with_same_ivars
+        array = [
+          NamedFunction.new('omg', 'zomg', 'wth'),
+          NamedFunction.new('omg', 'zomg', 'wth')
+        ]
+        assert_equal 1, array.uniq.size
+      end
+
+      def test_inequality_with_different_ivars
+        array = [
+          NamedFunction.new('omg', 'zomg', 'wth'),
+          NamedFunction.new('zomg', 'zomg', 'wth')
+        ]
+        assert_equal 2, array.uniq.size
+      end
     end
   end
 end

data/test/nodes/test_not.rb

@@ -12,6 +12,18 @@ module Arel
           node.expr.must_equal expr
         end
       end
+
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          array = [Not.new('foo'), Not.new('foo')]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          array = [Not.new('foo'), Not.new('baz')]
+          assert_equal 2, array.uniq.size
+        end
+      end
     end
   end
 end

data/test/nodes/test_or.rb

@@ -17,6 +17,18 @@ module Arel
           oror.expr.right.must_equal right
         end
       end
+
+      describe 'equality' do
+        it 'is equal with equal ivars' do
+          array = [Or.new('foo', 'bar'), Or.new('foo', 'bar')]
+          assert_equal 1, array.uniq.size
+        end
+
+        it 'is not equal with different ivars' do
+          array = [Or.new('foo', 'bar'), Or.new('foo', 'baz')]
+          assert_equal 2, array.uniq.size
+        end
+      end
     end
   end
 end

data/test/nodes/test_over.rb

@@ -46,4 +46,22 @@ describe Arel::Nodes::Over do
       }
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      array = [
+        Arel::Nodes::Over.new('foo', 'bar'),
+        Arel::Nodes::Over.new('foo', 'bar')
+      ]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      array = [
+        Arel::Nodes::Over.new('foo', 'bar'),
+        Arel::Nodes::Over.new('foo', 'baz')
+      ]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

data/test/nodes/test_select_core.rb

@@ -26,6 +26,44 @@ module Arel
         viz = Arel::Visitors::ToSql.new Table.engine.connection_pool
         assert_match 'DISTINCT', viz.accept(core)
       end
+
+      def test_equality_with_same_ivars
+        core1 = SelectCore.new
+        core1.froms       = %w[a b c]
+        core1.projections = %w[d e f]
+        core1.wheres      = %w[g h i]
+        core1.groups      = %w[j k l]
+        core1.windows     = %w[m n o]
+        core1.having      = %w[p q r]
+        core2 = SelectCore.new
+        core2.froms       = %w[a b c]
+        core2.projections = %w[d e f]
+        core2.wheres      = %w[g h i]
+        core2.groups      = %w[j k l]
+        core2.windows     = %w[m n o]
+        core2.having      = %w[p q r]
+        array = [core1, core2]
+        assert_equal 1, array.uniq.size
+      end
+
+      def test_inequality_with_different_ivars
+        core1 = SelectCore.new
+        core1.froms       = %w[a b c]
+        core1.projections = %w[d e f]
+        core1.wheres      = %w[g h i]
+        core1.groups      = %w[j k l]
+        core1.windows     = %w[m n o]
+        core1.having      = %w[p q r]
+        core2 = SelectCore.new
+        core2.froms       = %w[a b c]
+        core2.projections = %w[d e f]
+        core2.wheres      = %w[g h i]
+        core2.groups      = %w[j k l]
+        core2.windows     = %w[m n o]
+        core2.having      = %w[l o l]
+        array = [core1, core2]
+        assert_equal 2, array.uniq.size
+      end
     end
   end
 end

data/test/nodes/test_select_statement.rb

@@ -10,4 +10,40 @@ describe Arel::Nodes::SelectStatement do
       dolly.cores.wont_be_same_as statement.cores
     end
   end
+
+  describe 'equality' do
+    it 'is equal with equal ivars' do
+      statement1 = Arel::Nodes::SelectStatement.new %w[a b c]
+      statement1.offset = 1
+      statement1.limit  = 2
+      statement1.lock   = false
+      statement1.orders = %w[x y z]
+      statement1.with   = 'zomg'
+      statement2 = Arel::Nodes::SelectStatement.new %w[a b c]
+      statement2.offset = 1
+      statement2.limit  = 2
+      statement2.lock   = false
+      statement2.orders = %w[x y z]
+      statement2.with   = 'zomg'
+      array = [statement1, statement2]
+      assert_equal 1, array.uniq.size
+    end
+
+    it 'is not equal with different ivars' do
+      statement1 = Arel::Nodes::SelectStatement.new %w[a b c]
+      statement1.offset = 1
+      statement1.limit  = 2
+      statement1.lock   = false
+      statement1.orders = %w[x y z]
+      statement1.with   = 'zomg'
+      statement2 = Arel::Nodes::SelectStatement.new %w[a b c]
+      statement2.offset = 1
+      statement2.limit  = 2
+      statement2.lock   = false
+      statement2.orders = %w[x y z]
+      statement2.with   = 'wth'
+      array = [statement1, statement2]
+      assert_equal 2, array.uniq.size
+    end
+  end
 end

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/support/fake_record.rb

@@ -3,7 +3,7 @@ module FakeRecord
   end
 
   class Connection
-    attr_reader :tables, :columns_hash
+    attr_reader :tables
     attr_accessor :visitor
 
     def initialize(visitor = nil)
@@ -31,6 +31,10 @@ module FakeRecord
       @visitor = visitor
     end
 
+    def columns_hash table_name
+      @columns_hash[table_name]
+    end
+
     def primary_key name
       @primary_keys[name.to_s]
     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