summaryrefslogtreecommitdiff
path: root/sqlparse/lexer.py
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:48:55 +0100
committerAndi Albrecht <albrecht.andi@gmail.com>2015-02-21 07:48:55 +0100
commit51871a8ffa0de99e98e2b24794458c9aa6b36689 (patch)
tree8f5beb4e9c71c4e37513b800f118c8c67754804c /sqlparse/lexer.py
parent9eb0b8cbe89057601d577b744696b5c39f3a2b20 (diff)
parent703aec1fb30dcf5c0ed14552e601e4487707435e (diff)
downloadsqlparse-51871a8ffa0de99e98e2b24794458c9aa6b36689.tar.gz
Merge pull request #172 from JacekPliszka/master
Fix pathological case of empty statement
Diffstat (limited to 'sqlparse/lexer.py')
-rw-r--r--sqlparse/lexer.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index a60c789..3e9a1a6 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -315,7 +315,13 @@ class Lexer(object):
statestack.pop()
elif state == '#push':
statestack.append(statestack[-1])
- else:
+ elif (
+ # Ugly hack - multiline-comments
+ # are not stackable
+ state != 'multiline-comments'
+ or not statestack
+ or statestack[-1] != 'multiline-comments'
+ ):
statestack.append(state)
elif isinstance(new_state, int):
# pop