diff options
Diffstat (limited to 'sqlparse/keywords.py')
| -rw-r--r-- | sqlparse/keywords.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py index eef0d02..dee4030 100644 --- a/sqlparse/keywords.py +++ b/sqlparse/keywords.py @@ -10,22 +10,13 @@ import re from sqlparse import tokens -def is_keyword(value, remaining): +def is_keyword(value): val = value.upper() return (KEYWORDS_COMMON.get(val) or KEYWORDS_ORACLE.get(val) or KEYWORDS.get(val, tokens.Name)), value -def parse_literal_string(value, remaining): - try: - end = remaining[len(value):].index(value) - except ValueError: - return tokens.Name.Builtin, value - literal = remaining[:end + (len(value) * 2)] - return tokens.Literal, literal - - SQL_REGEX = { 'root': [ (r'(--|# )\+.*?(\r\n|\r|\n|$)', tokens.Comment.Single.Hint), @@ -44,7 +35,7 @@ SQL_REGEX = { (r"`(``|[^`])*`", tokens.Name), (r"´(´´|[^´])*´", tokens.Name), - (r'\$([_A-Z]\w*)?\$', parse_literal_string), + (r'(\$(?:[_A-Z]\w*)?\$)[\s\S]*?\1', tokens.Literal), (r'\?', tokens.Name.Placeholder), (r'%(\(\w+\))?s', tokens.Name.Placeholder), |