join sql stuff moved into sql adapter

Conflicts:

	lib/arel/algebra/primitives/value.rb
	lib/arel/algebra/relations/operations/join.rb
	lib/arel/algebra/relations/relation.rb
	spec/arel/unit/relations/join_spec.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/arel/unit/relations/relation_spec.rb b/spec/arel/unit/relations/relation_spec.rb
index 7df10be59c..6a61f39966 100644
--- a/spec/arel/unit/relations/relation_spec.rb
+++ b/spec/arel/unit/relations/relation_spec.rb
@@ -34,7 +34,7 @@ module Arel
           describe 'when given a relation' do
             it "manufactures an inner join operation between those two relations" do
               @relation.join(@relation).on(@predicate). \
-                should == Join.new("INNER JOIN", @relation, @relation, @predicate)
+                should == InnerJoin.new(@relation, @relation, @predicate)
             end
           end
 
@@ -54,7 +54,7 @@ module Arel
         describe '#outer_join' do
           it "manufactures a left outer join operation between those two relations" do
             @relation.outer_join(@relation).on(@predicate). \
-              should == Join.new("LEFT OUTER JOIN", @relation, @relation, @predicate)
+              should == OuterJoin.new(@relation, @relation, @predicate)
           end
         end
       end