From 9114ff791c224f8edfa6f1ff00ae57e8e3296f75 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 12 Jul 2009 09:28:05 +0200 Subject: Distinguish between operators that are part of a comparsion and others. --- sqlparse/engine/grouping.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sqlparse/engine') diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py index 1a0badf..c123d3c 100644 --- a/sqlparse/engine/grouping.py +++ b/sqlparse/engine/grouping.py @@ -100,7 +100,7 @@ def group_comparsion(tlist): return (token.ttype in (T.String.Symbol, T.Name, T.Number, T.Number.Integer, T.Literal) or isinstance(token, (Identifier,))) - _group_left_right(tlist, T.Operator, None, Comparsion, + _group_left_right(tlist, T.Operator.Comparsion, None, Comparsion, check_left=_parts_valid, check_right=_parts_valid) @@ -111,7 +111,8 @@ def group_case(tlist): def group_identifier(tlist): def _consume_cycle(tl, i): - x = itertools.cycle((lambda y: y.match(T.Punctuation, '.'), + x = itertools.cycle((lambda y: (y.match(T.Punctuation, '.') + or y.ttype is T.Operator), lambda y: y.ttype in (T.String.Symbol, T.Name, T.Wildcard))) -- cgit v1.2.1