join.rb in sql_tree-0.2.0

- old
+ new

@@ -1,19 +1,22 @@
 module SQLTree::Node
 
   class Join < Base
 
     leaf :join_type
+    leaf :is_outer
     child :table_reference
     child :join_expression
 
     def initialize(values = {})
+      self.is_outer = false
       values.each { |key, value| self.send(:"#{key}=", value) }
     end
 
     def to_sql(options = {})
       join_sql = join_type ? "#{join_type.to_s.upcase} " : ""
+      join_sql << "OUTER " if is_outer
       join_sql << "JOIN #{table_reference.to_sql(options)} "
       join_sql << "ON #{join_expression.to_sql(options)}"
       join_sql
     end
 
@@ -31,9 +34,14 @@
       if SQLTree::Token::FULL === tokens.peek
         join.join_type = :outer
         tokens.consume(SQLTree::Token::FULL, SQLTree::Token::OUTER)
       elsif [SQLTree::Token::OUTER, SQLTree::Token::INNER, SQLTree::Token::LEFT, SQLTree::Token::RIGHT].include?(tokens.peek.class)
         join.join_type = tokens.next.literal.downcase.to_sym
+      end
+
+      if [:right, :left].include?(join.join_type) && tokens.peek.class == SQLTree::Token::OUTER
+        join.is_outer = true
+        tokens.consume(SQLTree::Token::OUTER)
       end
 
       tokens.consume(SQLTree::Token::JOIN)
       join.table_reference = SQLTree::Node::TableReference.parse(tokens)
       tokens.consume(SQLTree::Token::ON)