From 74faef72d8e136a37bec93cc688817c97d162482 Mon Sep 17 00:00:00 2001 From: Adam Greenhall Date: Sat, 12 Sep 2015 01:52:01 -0700 Subject: Fix Case statements Alignment --- sqlparse/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sqlparse') diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 2ce17e9..193029f 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -410,7 +410,7 @@ class AlignedIndentFilter: end_token = tlist.token_next_match(0, T.Keyword, 'END') cases.append((None, [end_token])) - condition_width = max(len(str(cond)) for cond, value in cases) + condition_width = max(len(' '.join(map(str, cond))) for cond, value in cases if cond) for i, (cond, value) in enumerate(cases): if cond is None: # else or end stmt = value[0] @@ -421,7 +421,7 @@ class AlignedIndentFilter: if i > 0: tlist.insert_before(stmt, self.whitespace(base_offset + case_offset - len(str(stmt)))) if cond: - tlist.insert_after(cond[-1], self.whitespace(condition_width - len(str(cond)))) + tlist.insert_after(cond[-1], self.whitespace(condition_width - len(' '.join(map(str, cond))))) if i < len(cases) - 1: # if not the END add a newline -- cgit v1.2.1