From f4ea59ab4d76a2745ebf50f65bfbfe26f9db7195 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 15 Sep 2010 10:50:20 -0700 Subject: JoinSql visitor will visit left side if left is a join --- lib/arel/visitors/join_sql.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/arel/visitors') diff --git a/lib/arel/visitors/join_sql.rb b/lib/arel/visitors/join_sql.rb index ab3d10f99c..099e78b692 100644 --- a/lib/arel/visitors/join_sql.rb +++ b/lib/arel/visitors/join_sql.rb @@ -17,15 +17,21 @@ module Arel [ (visit o.left if Nodes::Join === o.left), visit(o.right) - ].join ' ' + ].compact.join ' ' end def visit_Arel_Nodes_OuterJoin o - "LEFT OUTER JOIN #{visit o.right} #{visit o.constraint}" + [ + (visit o.left if Nodes::Join === o.left), + "LEFT OUTER JOIN #{visit o.right} #{visit o.constraint if o.constraint}" + ].compact.join ' ' end def visit_Arel_Nodes_InnerJoin o - "INNER JOIN #{visit o.right} #{visit o.constraint if o.constraint}" + [ + (visit o.left if Nodes::Join === o.left), + "INNER JOIN #{visit o.right} #{visit o.constraint if o.constraint}" + ].compact.join ' ' end end end -- cgit v1.2.3