summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Uriarte <victor.m.uriarte@intel.com>2016-06-18 16:30:15 -0700
committerVictor Uriarte <victor.m.uriarte@intel.com>2016-06-18 18:06:29 -0700
commit24f0d3d650d4a83214c4a9539aa04cf4f3045f06 (patch)
treedf3e4962ca19b006223af616c4020a71a4b5f7e9
parent581912d36e2b10191e46fa891dce912693983c95 (diff)
downloadsqlparse-24f0d3d650d4a83214c4a9539aa04cf4f3045f06.tar.gz
Revert behavior of dangling period(hanging schema qualifier)
Related to #261. Reverting to previous behavior until a way to handle behavior/grouping of invalid sql is agreed upon.
-rw-r--r--sqlparse/engine/grouping.py4
-rw-r--r--tests/test_grouping.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index d5b5c4f..62357d3 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -99,10 +99,10 @@ def group_period(tlist):
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)
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
index 272d266..107900b 100644
--- a/tests/test_grouping.py
+++ b/tests/test_grouping.py
@@ -89,9 +89,9 @@ class TestGrouping(TestCaseBase):
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]