further reducing dependence on custom_joins

ddd6dee0 · Aaron Patterson · 2fd385d4 · ddd6dee0
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

activerecord/lib/active_record/relation/query_methods.rb activerecord/lib/active_record/relation/query_methods.rb +2 -0

未找到文件。
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -299,6 +299,8 @@ def build_joins(relation, joins)
        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