summaryrefslogtreecommitdiff
path: root/sqlparse/engine
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:55:30 +0100
committerAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:55:30 +0100
commit2d72b7afcb6d736f5a92a373bbb7a3aa1abed49b (patch)
treee2934e930bfa70780f1fad670842e394903551a0 /sqlparse/engine
parent51871a8ffa0de99e98e2b24794458c9aa6b36689 (diff)
parent6f134c67b6c89c2985e29bd5bc4c809cc16c06a5 (diff)
downloadsqlparse-2d72b7afcb6d736f5a92a373bbb7a3aa1abed49b.tar.gz
Merge pull request #171 from darikg/alias_bugfix
Fix #167
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,