Skip to content

Commit

Permalink
Revert behavior of dangling period(hanging schema qualifier)
Browse files Browse the repository at this point in the history
Related to #261.
Reverting to previous behavior until a way to handle behavior/grouping
of invalid sql is agreed upon.
  • Loading branch information
vmuriart committed Jun 19, 2016
1 parent 581912d commit 24f0d3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions sqlparse/engine/grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ def valid_prev(token):
def valid_next(token):
sqlcls = sql.SquareBrackets, sql.Function
ttypes = T.Name, T.String.Symbol, T.Wildcard
return imt(token, i=sqlcls, t=ttypes)
return token is None or imt(token, i=sqlcls, t=ttypes)

def post(tlist, pidx, tidx, nidx):
return pidx, nidx
return (pidx, nidx) if nidx is not None else (pidx, tidx)

_group(tlist, sql.Identifier, match, valid_prev, valid_next, post)

Expand Down
6 changes: 3 additions & 3 deletions tests/test_grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ def test_identifier_invalid(self):
p = sqlparse.parse('a.')[0]
self.assert_(isinstance(p.tokens[0], sql.Identifier))
self.assertEqual(p.tokens[0].has_alias(), False)
self.assertEqual(p.tokens[0].get_name(), 'a')
self.assertEqual(p.tokens[0].get_real_name(), 'a')
self.assertEqual(p.tokens[0].get_parent_name(), None)
self.assertEqual(p.tokens[0].get_name(), None)
self.assertEqual(p.tokens[0].get_real_name(), None)
self.assertEqual(p.tokens[0].get_parent_name(), 'a')

def test_identifier_as_invalid(self): # issue8
p = sqlparse.parse('foo as select *')[0]
Expand Down

0 comments on commit 24f0d3d

Please sign in to comment.