github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

manager will always be a manager

Browse Source
This commit is contained in:
Aaron Patterson
2010-12-10 11:30:22 -08:00
parent 82944b95a9
commit 4dec00a9d8
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -270,17 +270,13 @@ module ActiveRecord
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