summaryrefslogtreecommitdiff
path: root/sqlparse/engine
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:56:31 +0100
committerAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:56:31 +0100
commit0a813a6002978550310156943bd0d536f58ef807 (patch)
treedb4f0b9c8d1c80929b0955c85f1d34bf7fd9e38a /sqlparse/engine
parent8604e0343f83298b304fab022ff9ba00a7598f72 (diff)
parent2d72b7afcb6d736f5a92a373bbb7a3aa1abed49b (diff)
downloadsqlparse-0a813a6002978550310156943bd0d536f58ef807.tar.gz
Merge branch 'master' of github.com:andialbrecht/sqlparse
Diffstat (limited to 'sqlparse/engine')
-rw-r--r--sqlparse/engine/grouping.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index 47d3c2e..9314b89 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -155,9 +155,10 @@ 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 is T.ArrayIndex),
+ or y.ttype in (T.Operator,
+ T.Wildcard,
+ T.ArrayIndex,
+ T.Name)),
lambda y: (y.ttype in (T.String.Symbol,
T.Name,
T.Wildcard,