Merge commit 'brynary/master'

Conflicts:

	lib/arel.rb
	lib/arel/session.rb

4 files changed, 0 insertions, 235 deletions

diff --git a/spec/arel/unit/predicates/binary_spec.rb b/spec/arel/unit/predicates/binary_spec.rb
deleted file mode 100644
index 56fcf2d8ad..0000000000
--- a/spec/arel/unit/predicates/binary_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
-
-module Arel
-  describe Binary do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-      class ConcreteBinary < Binary
-        def predicate_sql
-          "<=>"
-        end
-      end
-    end
-
-    describe "with compound predicates" do
-      before do
-        @operand1 = ConcreteBinary.new(@attribute1, 1)
-        @operand2 = ConcreteBinary.new(@attribute2, "name")
-      end
-      
-      describe Or do
-        describe "#to_sql" do
-          it "manufactures sql with an OR operation" do
-            Or.new(@operand1, @operand2).to_sql.should be_like("
-              (`users`.`id` <=> 1 OR `users`.`name` <=> 'name')
-            ")
-          end
-        end
-      end
-
-      describe And do
-        describe "#to_sql" do
-          it "manufactures sql with an AND operation" do
-            And.new(@operand1, @operand2).to_sql.should be_like("
-              (`users`.`id` <=> 1 AND `users`.`name` <=> 'name')
-            ")
-          end
-        end
-      end
-    end
-    
-    describe '#to_sql' do
-      describe 'when relating two attributes' do
-        it 'manufactures sql with a binary operation' do
-          ConcreteBinary.new(@attribute1, @attribute2).to_sql.should be_like("
-            `users`.`id` <=> `users`.`name`
-          ")
-        end
-      end
-      
-      describe 'when relating an attribute and a value' do
-        before do
-          @value = "1-asdf"
-        end
-        
-        describe 'when relating to an integer attribute' do
-          it 'formats values as integers' do
-            ConcreteBinary.new(@attribute1, @value).to_sql.should be_like("
-              `users`.`id` <=> 1
-            ")
-          end
-        end
-        
-        describe 'when relating to a string attribute' do
-          it 'formats values as strings' do
-            ConcreteBinary.new(@attribute2, @value).to_sql.should be_like("
-              `users`.`name` <=> '1-asdf'
-            ")
-          end
-        end
-      end
-    end
-  
-    describe '#bind' do
-      before do
-        @another_relation = @relation.alias
-      end
-      
-      describe 'when both operands are attributes' do
-        it "manufactures an expression with the attributes bound to the relation" do
-          ConcreteBinary.new(@attribute1, @attribute2).bind(@another_relation). \
-            should == ConcreteBinary.new(@another_relation[@attribute1], @another_relation[@attribute2])
-        end
-      end
-      
-      describe 'when an operand is a value' do
-        it "manufactures an expression with unmodified values" do
-          ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \
-            should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation))
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/arel/unit/predicates/equality_spec.rb b/spec/arel/unit/predicates/equality_spec.rb
deleted file mode 100644
index 8a58ba3096..0000000000
--- a/spec/arel/unit/predicates/equality_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
-
-module Arel
-  describe Equality do
-    before do
-      @relation1 = Table.new(:users)
-      @relation2 = Table.new(:photos)
-      @attribute1 = @relation1[:id]
-      @attribute2 = @relation2[:user_id]
-    end
-  
-    describe '==' do 
-      it "obtains if attribute1 and attribute2 are identical" do
-        Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute1, @attribute2)
-        Equality.new(@attribute1, @attribute2).should_not == Equality.new(@attribute1, @attribute1)
-      end
-    
-      it "obtains if the concrete type of the predicates are identical" do
-        Equality.new(@attribute1, @attribute2).should_not == Binary.new(@attribute1, @attribute2)
-      end
-    
-      it "is commutative on the attributes" do
-        Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute2, @attribute1)
-      end
-    end
-    
-    describe '#to_sql' do
-      describe 'when relating to a non-nil value' do
-        it "manufactures an equality predicate" do
-          Equality.new(@attribute1, @attribute2).to_sql.should be_like("
-            `users`.`id` = `photos`.`user_id`
-          ")
-        end
-      end
-      
-      describe 'when relation to a nil value' do
-        before do
-          @nil = nil
-        end
-        
-        it "manufactures an is null predicate" do
-          Equality.new(@attribute1, @nil).to_sql.should be_like("
-            `users`.`id` IS NULL
-          ")
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/arel/unit/predicates/in_spec.rb b/spec/arel/unit/predicates/in_spec.rb
deleted file mode 100644
index 797798a77f..0000000000
--- a/spec/arel/unit/predicates/in_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
-
-module Arel
-  describe In do
-    before do
-      @relation = Table.new(:users)
-      @attribute = @relation[:id]
-    end
-  
-    describe '#to_sql' do 
-      describe 'when relating to an array' do
-        describe 'when the array\'s elements are the same type as the attribute' do
-          before do
-            @array = [1, 2, 3]
-          end
-          
-          it 'manufactures sql with a comma separated list' do
-            In.new(@attribute, @array).to_sql.should be_like("
-              `users`.`id` IN (1, 2, 3)
-            ")        
-          end
-        end
-        
-        describe 'when the array\'s elements are not same type as the attribute' do
-          before do
-            @array = ['1-asdf', 2, 3]
-          end
-          
-          it 'formats values in the array as the type of the attribute' do
-            In.new(@attribute, @array).to_sql.should be_like("
-              `users`.`id` IN (1, 2, 3)
-            ")
-          end
-        end
-      end
-      
-      describe 'when relating to a range' do
-        before do
-          @range = 1..2
-        end
-        
-        it 'manufactures sql with a between' do
-          In.new(@attribute, @range).to_sql.should be_like("
-            `users`.`id` BETWEEN 1 AND 2
-          ")                  
-        end
-      end
-      
-      describe 'when relating to a relation' do
-        it 'manufactures sql with a subselect' do
-          In.new(@attribute, @relation).to_sql.should be_like("
-            `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`)
-          ")        
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/spec/arel/unit/predicates/predicates_spec.rb b/spec/arel/unit/predicates/predicates_spec.rb
deleted file mode 100644
index d11637cabe..0000000000
--- a/spec/arel/unit/predicates/predicates_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
-
-module Arel
-  describe Predicate do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-      @operand1 = Equality.new(@attribute1, 1)
-      @operand2 = Equality.new(@attribute2, "name")
-    end
-    
-    describe "when being combined with another predicate with AND logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an AND operation" do
-          @operand1.and(@operand2).to_sql.should be_like("
-            (`users`.`id` = 1 AND `users`.`name` = 'name')
-          ")
-        end
-      end
-    end
-    
-    describe "when being combined with another predicate with OR logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an OR operation" do
-          @operand1.or(@operand2).to_sql.should be_like("
-            (`users`.`id` = 1 OR `users`.`name` = 'name')
-          ")
-        end
-      end
-    end
-  end
-end
\ No newline at end of file