Fix andialbrecht#284 as grouping

vmuriart · vmuriart · commit 31830af63555 · 2016-08-22T19:55:37.000-07:00
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -121,7 +121,7 @@ def valid_prev(token):
 
     def valid_next(token):
         ttypes = T.DML, T.DDL
-        return not imt(token, t=ttypes)
+        return not imt(token, t=ttypes) and token is not None
 
     def post(tlist, pidx, tidx, nidx):
         return pidx, nidx
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
@@ -314,3 +314,9 @@ def test_token_next_doesnt_ignore_skip_cm():
     sql = '--comment\nselect 1'
     tok = sqlparse.parse(sql)[0].token_next(-1, skip_cm=True)[1]
     assert tok.value == 'select'
+
+
+def test_issue284_as_grouping():
+    sql = 'SELECT x AS'
+    p = sqlparse.parse(sql)[0]
+    assert sql == str(p)
