manager will always be a manager

rails · Dec 10, 2010 · 4dec00a · 4dec00a
1 parent 82944b9
commit 4dec00a
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
@@ -270,17 +270,13 @@ def build_joins(manager, joins)
         manager = association.join_to(manager)
       end
 
-      if Arel::Table === manager
-        manager.from(join_ast || manager)
+      if manager.froms.length > 0 && join_ast
+        join_ast.left = manager.froms.first
+        manager.from join_ast
+      elsif manager.froms.length == 0 && join_ast
+        manager.from(join_ast)
       else
-        if manager.froms.length > 0 && join_ast
-          join_ast.left = manager.froms.first
-          manager.from join_ast
-        elsif manager.froms.length == 0 && join_ast
-          manager.from(join_ast)
-        else
-          manager
-        end
+        manager
       end
     end