diff options
| author | Andi Albrecht <albrecht.andi@gmail.com> | 2015-02-21 08:15:09 +0100 |
|---|---|---|
| committer | Andi Albrecht <albrecht.andi@gmail.com> | 2015-02-21 08:15:09 +0100 |
| commit | 9cec0cde3818005d70b0473f3c99241f5df68394 (patch) | |
| tree | 195c683a37221e307c600980c00dcddc9a2b76da /sqlparse/engine | |
| parent | 71af186659923dfe8721c551d5dbf4db7c4854d9 (diff) | |
| parent | 77e0789aea8918a2fbbc6f20196cd0bcdecccf52 (diff) | |
| download | sqlparse-9cec0cde3818005d70b0473f3c99241f5df68394.tar.gz | |
Merge master into v0.2.0 branch.
Diffstat (limited to 'sqlparse/engine')
| -rw-r--r-- | sqlparse/engine/grouping.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py index 6aa9e18..e9d77e6 100644 --- a/sqlparse/engine/grouping.py +++ b/sqlparse/engine/grouping.py @@ -150,11 +150,14 @@ def group_identifier(tlist): # TODO: Usage of Wildcard token is ambivalent here. x = itertools.cycle(( lambda y: (y.match(T.Punctuation, '.') - or y.ttype is T.Operator - or y.ttype is T.Wildcard), + or y.ttype in (T.Operator, + T.Wildcard, + T.ArrayIndex, + T.Name)), lambda y: (y.ttype in (T.String.Symbol, T.Name, T.Wildcard, + T.ArrayIndex, T.Literal.String.Single, T.Literal.Number.Integer, T.Literal.Number.Float) |