Previous fix for period failed when another token (non-groupable) followed.

vmuriart · vmuriart · commit b3700f44ff69 · 2016-06-19T07:52:46.000-07:00
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -97,12 +97,17 @@ def valid_prev(token):
         return imt(token, i=sqlcls, t=ttypes)
 
     def valid_next(token):
+        # issue261, allow invalid next token
+        return True
+
+    def post(tlist, pidx, tidx, nidx):
+        # next_ validation is being performed here. issue261
         sqlcls = sql.SquareBrackets, sql.Function
         ttypes = T.Name, T.String.Symbol, T.Wildcard
-        return token is None or imt(token, i=sqlcls, t=ttypes)
+        next_ = tlist[nidx] if nidx is not None else None
+        valid_next = imt(next_, i=sqlcls, t=ttypes)
 
-    def post(tlist, pidx, tidx, nidx):
-        return (pidx, nidx) if nidx is not None else (pidx, tidx)
+        return (pidx, nidx) if valid_next else (pidx, tidx)
 
     _group(tlist, sql.Identifier, match, valid_prev, valid_next, post)
 
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
@@ -93,6 +93,15 @@ def test_identifier_invalid(self):
         self.assertEqual(p.tokens[0].get_real_name(), None)
         self.assertEqual(p.tokens[0].get_parent_name(), 'a')
 
+    def test_identifier_invalid_in_middle(self):
+        # issue261
+        s = 'SELECT foo. FROM foo'
+        p = sqlparse.parse(s)[0]
+        assert isinstance(p[2], sql.Identifier)
+        assert p[2][1].ttype == T.Punctuation
+        assert p[3].ttype == T.Whitespace
+        assert str(p[2]) == 'foo.'
+
     def test_identifier_as_invalid(self):  # issue8
         p = sqlparse.parse('foo as select *')[0]
         self.assert_(len(p.tokens), 5)
