veritas-optimizer 0.0.3 → 0.0.4

data/spec/unit/veritas/optimizer/algebra/product/table_dee_left/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Product::TableDeeLeft, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/product/table_dee_right/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Product::TableDeeRight, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/product/table_dee_right/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Product::TableDeeRight, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/projection/empty_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::EmptyOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/projection/empty_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::EmptyOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/projection/projection_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::ProjectionOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/projection/projection_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::ProjectionOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/projection/{set_operand → union_operand}/optimizable_spec.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Optimizer::Algebra::Projection::SetOperand, '#optimizable?' do
+describe Optimizer::Algebra::Projection::UnionOperand, '#optimizable?' do
   subject { object.optimizable? }
 
   let(:header)   { Relation::Header.new([ [ :id, Integer ], [ :name, String ] ]) }

data/spec/unit/veritas/optimizer/algebra/projection/{set_operand → union_operand}/optimize_spec.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-describe Optimizer::Algebra::Projection::SetOperand, '#optimize' do
+describe Optimizer::Algebra::Projection::UnionOperand, '#optimize' do
   subject { object.optimize }
 
   let(:header)     { Relation::Header.new([ [ :id, Integer ], [ :name, String ], [ :age, Integer ] ]) }
@@ -15,7 +17,7 @@ describe Optimizer::Algebra::Projection::SetOperand, '#optimize' do
     object.should be_optimizable
   end
 
-  it { should be_kind_of(Relation::Operation::Set) }
+  it { should be_kind_of(Algebra::Union) }
 
   its(:left) { should eql(base_left.project([ :id ])) }
 

data/spec/unit/veritas/optimizer/algebra/projection/unoptimized_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::UnoptimizedOperand, '#optimizable?' do
@@ -13,7 +15,7 @@ describe Optimizer::Algebra::Projection::UnoptimizedOperand, '#optimizable?' do
   end
 
   context 'when the operand is optimizable' do
-    let(:operand) { base.restrict(Logic::Proposition::Tautology.instance) }
+    let(:operand) { base.restrict { Function::Proposition::Tautology.instance } }
 
     it { should be(true) }
   end

data/spec/unit/veritas/optimizer/algebra/projection/unoptimized_operand/optimize_spec.rb

@@ -1,12 +1,14 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Projection::UnoptimizedOperand, '#optimize' do
   subject { object.optimize }
 
-  let(:header)   { Relation::Header.new([ [ :id, Integer ], [ :name, String ] ])          }
-  let(:base)     { Relation.new(header, [ [ 1, 'Dan Kubb' ] ].each)                       }
-  let(:relation) { base.restrict(Logic::Proposition::Tautology.instance).project([ :id ]) }
-  let(:object)   { described_class.new(relation)                                          }
+  let(:header)   { Relation::Header.new([ [ :id, Integer ], [ :name, String ] ])                }
+  let(:base)     { Relation.new(header, [ [ 1, 'Dan Kubb' ] ].each)                             }
+  let(:relation) { base.restrict { Function::Proposition::Tautology.instance }.project([ :id ]) }
+  let(:object)   { described_class.new(relation)                                                }
 
   before do
     object.should be_optimizable

data/spec/unit/veritas/optimizer/algebra/rename/aliases_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename, '#aliases' do
@@ -13,19 +15,9 @@ describe Optimizer::Algebra::Rename, '#aliases' do
     object.operation.should be_kind_of(Algebra::Rename)
   end
 
-  context 'when the operand is a rename' do
-    let(:relation) { base.rename(aliases).rename(:other_id => :another_id) }
-
-    it { should be_kind_of(Algebra::Rename::Aliases) }
-
-    it { should == { attribute => attribute.rename(:another_id) } }
-  end
-
-  context 'when the operand is not a rename' do
-    let(:relation) { base.rename(aliases) }
+  let(:relation) { base.rename(aliases) }
 
-    it { should be_kind_of(Algebra::Rename::Aliases) }
+  it { should be_kind_of(Algebra::Rename::Aliases) }
 
-    it { should == { attribute => attribute.rename(:other_id) } }
-  end
+  it { should equal(relation.aliases) }
 end

data/spec/unit/veritas/optimizer/algebra/rename/empty_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::EmptyOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/empty_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::EmptyOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/limit_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::LimitOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/limit_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::LimitOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/offset_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::OffsetOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/offset_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::OffsetOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/order_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::OrderOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/order_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::OrderOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/projection_operand/optimizable_spec.rb

@@ -1,25 +1,35 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::ProjectionOperand, '#optimizable?' do
   subject { object.optimizable? }
 
-  let(:header)   { Relation::Header.new([ [ :id, Integer ], [ :name, String ] ]) }
-  let(:base)     { Relation.new(header, [ [ 1, 'Dan Kubb' ] ].each)              }
-  let(:relation) { operand.rename(:id => :other_id)                              }
-  let(:object)   { described_class.new(relation)                                 }
+  let(:header) { Relation::Header.new([ [ :one, Integer ], [ :two, Integer ] ]) }
+  let(:base)   { Relation.new(header, [ [ 1, 2 ] ].each)                        }
+  let(:object) { described_class.new(relation)                                  }
 
   before do
     object.operation.should be_kind_of(Algebra::Rename)
   end
 
-  context 'when the operand is a projection' do
-    let(:operand) { base.project([ :id ]) }
+  context 'when the operand is a projection and the alias does not conflict with a removed column' do
+    let(:operand)  { base.project([ :one ])         }
+    let(:relation) { operand.rename(:one => :other) }
 
     it { should be(true) }
   end
 
+  context 'when the operand is a projection and the alias conflicts with a removed column' do
+    let(:operand)  { base.project([ :one ])       }
+    let(:relation) { operand.rename(:one => :two) }
+
+    it { should be(false) }
+  end
+
   context 'when the operand is not a projection' do
-    let(:operand) { base }
+    let(:operand)  { base                           }
+    let(:relation) { operand.rename(:one => :other) }
 
     it { should be(false) }
   end

data/spec/unit/veritas/optimizer/algebra/rename/projection_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::ProjectionOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/rename_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RenameOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/rename_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RenameOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/rename_operand_and_empty_aliases/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RenameOperandAndEmptyAliases, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/rename_operand_and_empty_aliases/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RenameOperandAndEmptyAliases, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/restriction_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RestrictionOperand, '#optimizable?' do
@@ -14,7 +16,7 @@ describe Optimizer::Algebra::Rename::RestrictionOperand, '#optimizable?' do
   end
 
   context 'when the operand is a restriction' do
-    let(:operand) { base.restrict(predicate) }
+    let(:operand) { base.restrict { predicate } }
 
     it { should be(true) }
   end

data/spec/unit/veritas/optimizer/algebra/rename/restriction_operand/optimize_spec.rb

@@ -1,13 +1,15 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::RestrictionOperand, '#optimize' do
   subject { object.optimize }
 
-  let(:header)    { Relation::Header.new([ [ :id, Integer ] ])        }
-  let(:base)      { Relation.new(header, [ [ 1 ] ].each)              }
-  let(:predicate) { base[:id].eq(1)                                   }
-  let(:relation)  { base.restrict(predicate).rename(:id => :other_id) }
-  let(:object)    { described_class.new(relation)                     }
+  let(:header)    { Relation::Header.new([ [ :id, Integer ] ])           }
+  let(:base)      { Relation.new(header, [ [ 1 ] ].each)                 }
+  let(:predicate) { base[:id].eq(1)                                      }
+  let(:relation)  { base.restrict { predicate }.rename(:id => :other_id) }
+  let(:object)    { described_class.new(relation)                        }
 
   before do
     object.should be_optimizable

data/spec/unit/veritas/optimizer/algebra/rename/reverse_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::ReverseOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/reverse_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::ReverseOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/set_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::SetOperand, '#optimizable?' do

data/spec/unit/veritas/optimizer/algebra/rename/set_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::SetOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::UnoptimizedOperand, '#optimizable?' do
@@ -6,36 +8,21 @@ describe Optimizer::Algebra::Rename::UnoptimizedOperand, '#optimizable?' do
   let(:header)   { Relation::Header.new([ [ :id, Integer ] ]) }
   let(:base)     { Relation.new(header, [ [ 1 ] ].each)       }
   let(:relation) { operand.rename(aliases)                    }
+  let(:aliases)  { { :id => :other_id }                       }
   let(:object)   { described_class.new(relation)              }
 
   before do
     object.operation.should be_kind_of(Algebra::Rename)
   end
 
-  context 'when the operand and aliases are optimizable' do
-    let(:aliases) { { :other_id => :another_id }                  }
-    let(:operand) { base.project(header).rename(:id => :other_id) }
-
-    it { should be(true) }
-  end
-
-  context 'when the operand is optimizable, but the aliases are not optimizable' do
-    let(:aliases) { { :id => :other_id } }
-    let(:operand) { base.project(header) }
-
-    it { should be(true) }
-  end
-
-  context 'when the operand is not optimizable, but the aliases are optimizable' do
-    let(:aliases) { { :other_id => :another_id }  }
-    let(:operand) { base.rename(:id => :other_id) }
+  context 'when the operand is optimizable' do
+    let(:operand) { base.rename({}) }
 
     it { should be(true) }
   end
 
-  context 'when the operand and aliases are not optimizable' do
-    let(:aliases) { { :id => :other_id } }
-    let(:operand) { base                 }
+  context 'when the operand is not optimizable' do
+    let(:operand) { base }
 
     it { should be(false) }
   end

data/spec/unit/veritas/optimizer/algebra/rename/unoptimized_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Rename::UnoptimizedOperand, '#optimize' do

data/spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::Contradiction, '#optimizable?' do
@@ -5,7 +7,7 @@ describe Optimizer::Algebra::Restriction::Contradiction, '#optimizable?' do
 
   let(:header)   { Relation::Header.new([ [ :id, Integer ] ]) }
   let(:base)     { Relation.new(header, [ [ 1 ] ].each)       }
-  let(:relation) { base.restrict(predicate)                   }
+  let(:relation) { base.restrict { predicate }                }
   let(:object)   { described_class.new(relation)              }
 
   before do
@@ -13,13 +15,31 @@ describe Optimizer::Algebra::Restriction::Contradiction, '#optimizable?' do
   end
 
   context 'when the predicate is a contradiction' do
-    let(:predicate) { Logic::Proposition::Contradiction.instance }
+    let(:predicate) { Function::Proposition::Contradiction.instance }
 
     it { should be(true) }
   end
 
   context 'when the predicate is not a contradiction' do
-    let(:predicate) { Logic::Proposition::Tautology.instance }
+    let(:predicate) { Function::Proposition::Tautology.instance }
+
+    it { should be(false) }
+  end
+
+  context 'when the predicate is false' do
+    let(:predicate) { false }
+
+    it { should be(true) }
+  end
+
+  context 'when the predicate is true' do
+    let(:predicate) { true }
+
+    it { should be(false) }
+  end
+
+  context 'when the predicate is a Proc' do
+    let(:predicate) { proc { false } }
 
     it { should be(false) }
   end

data/spec/unit/veritas/optimizer/algebra/restriction/contradiction/optimize_spec.rb

@@ -1,13 +1,15 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::Contradiction, '#optimize' do
   subject { object.optimize }
 
-  let(:header)    { Relation::Header.new([ [ :id, Integer ] ]) }
-  let(:base)      { Relation.new(header, [ [ 1 ] ].each)       }
-  let(:predicate) { Logic::Proposition::Contradiction.instance }
-  let(:relation)  { base.restrict(predicate)                   }
-  let(:object)    { described_class.new(relation)              }
+  let(:header)    { Relation::Header.new([ [ :id, Integer ] ])    }
+  let(:base)      { Relation.new(header, [ [ 1 ] ].each)          }
+  let(:predicate) { Function::Proposition::Contradiction.instance }
+  let(:relation)  { base.restrict { predicate }                   }
+  let(:object)    { described_class.new(relation)                 }
 
   before do
     object.should be_optimizable

data/spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::OrderOperand, '#optimizable?' do
@@ -5,7 +7,7 @@ describe Optimizer::Algebra::Restriction::OrderOperand, '#optimizable?' do
 
   let(:base)      { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
   let(:predicate) { base[:id].eq(1)                                    }
-  let(:relation)  { operand.restrict(predicate)                        }
+  let(:relation)  { operand.restrict { predicate }                     }
   let(:object)    { described_class.new(relation)                      }
 
   before do

data/spec/unit/veritas/optimizer/algebra/restriction/order_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::OrderOperand, '#optimize' do
@@ -5,14 +7,16 @@ describe Optimizer::Algebra::Restriction::OrderOperand, '#optimize' do
 
   let(:base)      { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ].each) }
   let(:predicate) { base[:id].eq(1)                                    }
-  let(:relation)  { base.order.restrict(predicate)                     }
+  let(:relation)  { base.order.restrict { predicate }                  }
   let(:object)    { described_class.new(relation)                      }
 
   before do
     object.should be_optimizable
   end
 
-  it { should be_kind_of(Relation::Operation::Order) }
+  it { should be_kind_of(Algebra::Restriction) }
+
+  its(:operand) { should equal(base) }
 
-  its(:operand) { should eql(base.restrict(predicate)) }
+  its(:predicate) { should equal(predicate) }
 end

data/spec/unit/veritas/optimizer/algebra/restriction/predicate_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction, '#predicate' do
@@ -5,7 +7,7 @@ describe Optimizer::Algebra::Restriction, '#predicate' do
 
   let(:base)      { Relation.new([ [ :id, Integer ] ], [ [ 1 ] ]) }
   let(:predicate) { base[:id].eq(1)                               }
-  let(:relation)  { base.restrict(predicate)                      }
+  let(:relation)  { base.restrict { predicate }                   }
   let(:object)    { described_class.new(relation)                 }
 
   before do

data/spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::RestrictionOperand, '#optimizable?' do
@@ -6,7 +8,7 @@ describe Optimizer::Algebra::Restriction::RestrictionOperand, '#optimizable?' do
   let(:header)    { Relation::Header.new([ [ :id, Integer ] ]) }
   let(:base)      { Relation.new(header, [ [ 1 ] ].each)       }
   let(:predicate) { header[:id].eq(1)                          }
-  let(:relation)  { operand.restrict(predicate)                }
+  let(:relation)  { operand.restrict { predicate }             }
   let(:object)    { described_class.new(relation)              }
 
   before do
@@ -14,8 +16,8 @@ describe Optimizer::Algebra::Restriction::RestrictionOperand, '#optimizable?' do
   end
 
   context 'when the operand is an restriction operation' do
-    let(:other_predicate) { header[:id].include([ 1 ])     }
-    let(:operand)         { base.restrict(other_predicate) }
+    let(:other_predicate) { header[:id].include([ 1 ])        }
+    let(:operand)         { base.restrict { other_predicate } }
 
     it { should be(true) }
   end

data/spec/unit/veritas/optimizer/algebra/restriction/restriction_operand/optimize_spec.rb

@@ -1,14 +1,16 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::RestrictionOperand, '#optimize' do
   subject { object.optimize }
 
-  let(:header)          { Relation::Header.new([ [ :id, Integer ] ])         }
-  let(:base)            { Relation.new(header, [ [ 1 ] ].each)               }
-  let(:predicate)       { header[:id].eq(1)                                  }
-  let(:other_predicate) { header[:id].include([ 1 ])                         }
-  let(:relation)        { base.restrict(predicate).restrict(other_predicate) }
-  let(:object)          { described_class.new(relation)                      }
+  let(:header)          { Relation::Header.new([ [ :id, Integer ] ])               }
+  let(:base)            { Relation.new(header, [ [ 1 ] ].each)                     }
+  let(:predicate)       { header[:id].eq(1)                                        }
+  let(:other_predicate) { header[:id].include([ 1 ])                               }
+  let(:relation)        { base.restrict { predicate }.restrict { other_predicate } }
+  let(:object)          { described_class.new(relation)                            }
 
   before do
     object.should be_optimizable

data/spec/unit/veritas/optimizer/algebra/restriction/set_operand/optimizable_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::SetOperand, '#optimizable?' do
@@ -7,7 +9,7 @@ describe Optimizer::Algebra::Restriction::SetOperand, '#optimizable?' do
   let(:left)      { Relation.new(header, [ [ 1 ] ].each)       }
   let(:right)     { Relation.new(header, [ [ 2 ] ].each)       }
   let(:predicate) { header[:id].eq(1)                          }
-  let(:relation)  { operand.restrict(predicate)                }
+  let(:relation)  { operand.restrict { predicate }             }
   let(:object)    { described_class.new(relation)              }
 
   before do

data/spec/unit/veritas/optimizer/algebra/restriction/set_operand/optimize_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Optimizer::Algebra::Restriction::SetOperand, '#optimize' do
@@ -7,7 +9,7 @@ describe Optimizer::Algebra::Restriction::SetOperand, '#optimize' do
   let(:left)      { Relation.new(header, [ [ 1 ] ].each)       }
   let(:right)     { Relation.new(header, [ [ 2 ] ].each)       }
   let(:predicate) { header[:id].eq(1)                          }
-  let(:relation)  { left.union(right).restrict(predicate)      }
+  let(:relation)  { left.union(right).restrict { predicate }   }
   let(:object)    { described_class.new(relation)              }
 
   before do
@@ -16,7 +18,7 @@ describe Optimizer::Algebra::Restriction::SetOperand, '#optimize' do
 
   it { should be_kind_of(Relation::Operation::Set) }
 
-  its(:left) { should eql(left.restrict(predicate)) }
+  its(:left) { should eql(left.restrict { predicate }) }
 
-  its(:right) { should eql(right.restrict(predicate)) }
+  its(:right) { should eql(right.restrict { predicate }) }
 end