Merge commit 'brynary/master'

Conflicts:

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

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/arel/algebra/unit/predicates/binary_spec.rb b/spec/arel/algebra/unit/predicates/binary_spec.rb
new file mode 100644
index 0000000000..14fd7ab21b
--- /dev/null
+++ b/spec/arel/algebra/unit/predicates/binary_spec.rb
@@ -0,0 +1,33 @@
+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
+      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