diff options
| author | mvbentes <mvbentes@users.noreply.github.com> | 2017-08-25 21:22:42 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 21:22:42 -0300 |
| commit | 617d38908bb999018598e3cbbdd123a992a08ba9 (patch) | |
| tree | 8932a69171f4494d96f72bbd20541a712e9e42e1 /sqlparse | |
| parent | 7d91d361ad8c26af3fe0a15b807db4cefa5d000a (diff) | |
| download | sqlparse-617d38908bb999018598e3cbbdd123a992a08ba9.tar.gz | |
Extend alphas with accented characters
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/keywords.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py index 40022b9..086aae9 100644 --- a/sqlparse/keywords.py +++ b/sqlparse/keywords.py @@ -35,7 +35,7 @@ SQL_REGEX = { (r"`(``|[^`])*`", tokens.Name), (r"´(´´|[^´])*´", tokens.Name), - (r'(\$(?:[_A-Z]\w*)?\$)[\s\S]*?\1', tokens.Literal), + (r'(\$(?:[_A-ZÀ-Ü]\w*)?\$)[\s\S]*?\1', tokens.Literal), (r'\?', tokens.Name.Placeholder), (r'%(\(\w+\))?s', tokens.Name.Placeholder), @@ -47,20 +47,20 @@ SQL_REGEX = { # is never a functino, see issue183 (r'(CASE|IN|VALUES|USING)\b', tokens.Keyword), - (r'(@|##|#)[A-Z]\w+', tokens.Name), + (r'(@|##|#)[A-ZÀ-Ü]\w+', tokens.Name), # see issue #39 # Spaces around period `schema . name` are valid identifier # TODO: Spaces before period not implemented - (r'[A-Z]\w*(?=\s*\.)', tokens.Name), # 'Name' . - (r'(?<=\.)[A-Z]\w*', tokens.Name), # .'Name' - (r'[A-Z]\w*(?=\()', tokens.Name), # side effect: change kw to func + (r'[A-ZÀ-Ü]\w*(?=\s*\.)', tokens.Name), # 'Name' . + (r'(?<=\.)[A-ZÀ-Ü]\w*', tokens.Name), # .'Name' + (r'[A-ZÀ-Ü]\w*(?=\()', tokens.Name), # side effect: change kw to func # TODO: `1.` and `.1` are valid numbers (r'-?0x[\dA-F]+', tokens.Number.Hexadecimal), (r'-?\d*(\.\d+)?E-?\d+', tokens.Number.Float), (r'-?\d*\.\d+', tokens.Number.Float), - (r'-?\d+(?![_A-Z])', tokens.Number.Integer), + (r'-?\d+(?![_A-ZÀ-Ü])', tokens.Number.Integer), (r"'(''|\\\\|\\'|[^'])*'", tokens.String.Single), # not a real string literal in ANSI SQL: @@ -77,7 +77,7 @@ SQL_REGEX = { (r'CREATE(\s+OR\s+REPLACE)?\b', tokens.Keyword.DDL), (r'DOUBLE\s+PRECISION\b', tokens.Name.Builtin), - (r'[0-9_A-Z][_$#\w]*', is_keyword), + (r'[0-9_A-ZÀ-Ü][_$#\w]*', is_keyword), (r'[;:()\[\],\.]', tokens.Punctuation), (r'[<>=~!]+', tokens.Operator.Comparison), |