Merge pull request andialbrecht#112 from alexander-beedie/master

andialbrecht · andialbrecht · commit 6efac742ec85 · 2013-10-23T20:48:07.000-07:00
extended JOIN token recognition/lexing (eg: FULL OUTER JOIN, NATURAL JOIN)
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
@@ -550,6 +550,7 @@
     'ORDER': tokens.Keyword,
     'LEFT': tokens.Keyword,
     'OUTER': tokens.Keyword,
+    'FULL': tokens.Keyword,
 
     'IF': tokens.Keyword,
     'END': tokens.Keyword,
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
@@ -195,7 +195,7 @@ class Lexer(object):
             # not a real string literal in ANSI SQL:
             (r'(""|".*?[^\\]")', tokens.String.Symbol),
             (r'(\[.*[^\]]\])', tokens.Name),
-            (r'(LEFT\s+|RIGHT\s+)?(INNER\s+|OUTER\s+|STRAIGHT\s+)?JOIN\b', tokens.Keyword),
+            (r'((LEFT\s+|RIGHT\s+|FULL\s+)?(INNER\s+|OUTER\s+|STRAIGHT\s+)?|(CROSS\s+|NATURAL\s+)?)?JOIN\b', tokens.Keyword),
             (r'END(\s+IF|\s+LOOP)?\b', tokens.Keyword),
             (r'NOT NULL\b', tokens.Keyword),
             (r'CREATE(\s+OR\s+REPLACE)?\b', tokens.Keyword.DDL),
