Skip to content

Commit 24f0d3d

Browse files
committed
Revert behavior of dangling period(hanging schema qualifier)
Related to andialbrecht#261. Reverting to previous behavior until a way to handle behavior/grouping of invalid sql is agreed upon.
1 parent 581912d commit 24f0d3d

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

sqlparse/engine/grouping.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ def valid_prev(token):
9999
def valid_next(token):
100100
sqlcls = sql.SquareBrackets, sql.Function
101101
ttypes = T.Name, T.String.Symbol, T.Wildcard
102-
return imt(token, i=sqlcls, t=ttypes)
102+
return token is None or imt(token, i=sqlcls, t=ttypes)
103103

104104
def post(tlist, pidx, tidx, nidx):
105-
return pidx, nidx
105+
return (pidx, nidx) if nidx is not None else (pidx, tidx)
106106

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

tests/test_grouping.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def test_identifier_invalid(self):
8989
p = sqlparse.parse('a.')[0]
9090
self.assert_(isinstance(p.tokens[0], sql.Identifier))
9191
self.assertEqual(p.tokens[0].has_alias(), False)
92-
self.assertEqual(p.tokens[0].get_name(), 'a')
93-
self.assertEqual(p.tokens[0].get_real_name(), 'a')
94-
self.assertEqual(p.tokens[0].get_parent_name(), None)
92+
self.assertEqual(p.tokens[0].get_name(), None)
93+
self.assertEqual(p.tokens[0].get_real_name(), None)
94+
self.assertEqual(p.tokens[0].get_parent_name(), 'a')
9595

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

0 commit comments

Comments
 (0)