summaryrefslogtreecommitdiff
path: root/sqlparse
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2012-11-07 12:03:37 -0800
committerAndi Albrecht <albrecht.andi@gmail.com>2012-11-07 12:03:37 -0800
commit4f5f034a1f0699ff9f9b180e9d0d3f79cc69b1d3 (patch)
tree6966e0aaf16d1a61ce3afbc13bf929130555a6f0 /sqlparse
parent997135e26c6e68becc178d312dc8b073033cb13c (diff)
parenteb9afb54f65d1d0ffeaa0a083bbccf0a048fb162 (diff)
downloadsqlparse-4f5f034a1f0699ff9f9b180e9d0d3f79cc69b1d3.tar.gz
Merge pull request #79 from MikeAmy/master
Stop VARCHAR being lost by grouping logic.
Diffstat (limited to 'sqlparse')
-rw-r--r--sqlparse/engine/grouping.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
index 1487c24..f30d9e1 100644
--- a/sqlparse/engine/grouping.py
+++ b/sqlparse/engine/grouping.py
@@ -289,10 +289,11 @@ def group_aliased(tlist):
while token:
next_ = tlist.token_next(tlist.token_index(token))
if next_ is not None and isinstance(next_, clss):
- grp = tlist.tokens_between(token, next_)[1:]
- token.tokens.extend(grp)
- for t in grp:
- tlist.tokens.remove(t)
+ if not next_.value.upper().startswith('VARCHAR'):
+ grp = tlist.tokens_between(token, next_)[1:]
+ token.tokens.extend(grp)
+ for t in grp:
+ tlist.tokens.remove(t)
idx = tlist.token_index(token) + 1
token = tlist.token_next_by_instance(idx, clss)