Fix from( parsing issue (fixes #446)

2 files changed, 19 insertions, 1 deletions

diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index 28545d8..985334d 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -47,7 +47,7 @@ SQL_REGEX = {
         # see https://github.com/andialbrecht/sqlparse/pull/64
         # IN is special, it may be followed by a parenthesis, but
         # is never a function, see issue183
-        (r'(CASE|IN|VALUES|USING)\b', tokens.Keyword),
+        (r'(CASE|IN|VALUES|USING|FROM)\b', tokens.Keyword),
 
         (r'(@|##|#)[A-ZÀ-Ü]\w+', tokens.Name),
 
diff --git a/tests/test_parse.py b/tests/test_parse.py
index d191f65..4fad526 100644
--- a/tests/test_parse.py
+++ b/tests/test_parse.py
@@ -435,6 +435,24 @@ def test_get_real_name():
     assert 't' == stmts[0].get_alias()
 
 
+def test_from_subquery():
+    # issue 446
+    s = u'from(select 1)'
+    stmts = sqlparse.parse(s)
+    assert len(stmts) == 1
+    assert len(stmts[0].tokens) == 2
+    assert stmts[0].tokens[0].value == 'from'
+    assert stmts[0].tokens[0].ttype == T.Keyword
+
+    s = u'from (select 1)'
+    stmts = sqlparse.parse(s)
+    assert len(stmts) == 1
+    assert len(stmts[0].tokens) == 3
+    assert stmts[0].tokens[0].value == 'from'
+    assert stmts[0].tokens[0].ttype == T.Keyword
+    assert stmts[0].tokens[1].ttype == T.Whitespace
+
+
 def test_parenthesis():
     tokens = sqlparse.parse("(\n\n1\n\n)")[0].tokens[0].tokens
     assert list(map(lambda t: t.ttype, tokens)) == [T.Punctuation,