From ddd6dee04343d3731b2f2fc558501c3707cde8fb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 8 Dec 2010 10:35:26 -0800
Subject: further reducing dependence on custom_joins

---
 activerecord/lib/active_record/relation/query_methods.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 705bf21eae..3a2cbc8dda 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -299,6 +299,8 @@ module ActiveRecord
         if relation.froms.length > 0 && ast
           ast.left = relation.froms.first
           relation.from ast
+        elsif relation.froms.length == 0 && ast
+          relation.from(ast)
         else
           relation.join(custom_joins)
         end
-- 
cgit v1.2.3