string passthrough for joins

2 files changed, 13 insertions, 7 deletions

diff --git a/spec/active_relation/unit/relations/join_spec.rb b/spec/active_relation/unit/relations/join_spec.rb
index 30ac73b611..b274da7565 100644
--- a/spec/active_relation/unit/relations/join_spec.rb
+++ b/spec/active_relation/unit/relations/join_spec.rb
@@ -108,7 +108,7 @@ module ActiveRelation
       end
     end
     
-    describe 'with aggregated relations' do
+    describe 'when joining aggregated relations' do
       before do
         @aggregation = @relation2                                 \
           .aggregate(@relation2[:user_id], @relation2[:id].count) \
@@ -157,6 +157,16 @@ module ActiveRelation
           ")
         end
       end
-    end    
+    end
+    
+    describe 'when joining with a string' do
+      it "passes the string through to the where clause" do
+        Join.new("INNER JOIN ON asdf", @relation1).to_sql.should be_like("
+          SELECT `users`.`id`, `users`.`name`
+          FROM `users`
+            INNER JOIN ON asdf
+        ")        
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/spec/active_relation/unit/relations/selection_spec.rb b/spec/active_relation/unit/relations/selection_spec.rb
index 1919d3007e..20833de58d 100644
--- a/spec/active_relation/unit/relations/selection_spec.rb
+++ b/spec/active_relation/unit/relations/selection_spec.rb
@@ -48,12 +48,8 @@ module ActiveRelation
       end
       
       describe 'when given a string' do
-        before do
-          @string = "asdf"
-        end
-        
         it "passes the string through to the where clause" do
-          Selection.new(@relation, @string).to_sql.should be_like("
+          Selection.new(@relation, 'asdf').to_sql.should be_like("
             SELECT `users`.`id`, `users`.`name`
             FROM `users`
             WHERE asdf