[NEW] Now supportes OUTER as a LEFT/RIGHT join modifier (e.g. LEFT OUTER

JOIN)

Author: jasonallen

lib/sql_tree/node/join.rb

@@ -3,15 +3,18 @@ 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
@@ -35,6 +38,11 @@ def self.parse(tokens)
         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)

spec/integration/parse_and_generate_spec.rb

@@ -99,4 +99,9 @@
   #   SQLTree["SELECT count(*) FROM jobs"].to_sql.should ==
   #     "SELECT count(*) FROM jobs"
   # end
+
+  it "should parse and generate a LEFT OUTER JOIN query" do
+    SQLTree["SELECT * FROM table_a LEFT OUTER JOIN table_b ON foo = bar"].to_sql.should ==
+      "SELECT * FROM \"table_a\" LEFT OUTER JOIN \"table_b\" ON (\"foo\" = \"bar\")"
+  end
 end

spec/unit/select_query_spec.rb

@@ -73,6 +73,10 @@
   it "should parse a table alias without AS" do
     SQLTree::Node::Join['LEFT JOIN table t ON other.field = table.field'].table_alias.should == 't'
   end
+
+  it "should parse an outer join table" do
+    SQLTree::Node::Join['LEFT OUTER JOIN table ON other.field = table.field'].table.should == 'table'
+  end
 end
 
 describe SQLTree::Node::Ordering do