diff options
author | Georg Brandl <georg@python.org> | 2014-09-16 09:49:24 +0200 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2014-09-16 09:49:24 +0200 |
commit | 1caf41ee05e9546ed0011d5d999c9289f10ee21d (patch) | |
tree | 10d26dc76608e6cebf12453d29491af855497225 | |
parent | 2210f6844a8623b39aef820a4ba8322abc5f7ed6 (diff) | |
parent | 1987be8c8f814b4fb5ec3240e91a7ce2a399ed26 (diff) | |
download | pygments-1caf41ee05e9546ed0011d5d999c9289f10ee21d.tar.gz |
Merged in bgirardeau/pygments-main (pull request #394)
Parse backslash escaped quotes in MySQL strings
-rw-r--r-- | pygments/lexers/sql.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py index 7540f079..5070d487 100644 --- a/pygments/lexers/sql.py +++ b/pygments/lexers/sql.py @@ -464,10 +464,9 @@ class MySqlLexer(RegexLexer): (r'/\*', Comment.Multiline, 'multiline-comments'), (r'[0-9]+', Number.Integer), (r'[0-9]*\.[0-9]+(e[+-][0-9]+)', Number.Float), - # TODO: add backslash escapes - (r"'(''|[^'])*'", String.Single), - (r'"(""|[^"])*"', String.Double), - (r"`(``|[^`])*`", String.Symbol), + (r"'(\\\\|\\'|''|[^'])*'", String.Single), + (r'"(\\\\|\\"|""|[^"])*"', String.Double), + (r"`(\\\\|\\`|``|[^`])*`", String.Symbol), (r'[+*/<>=~!@#%^&|`?-]', Operator), (r'\b(tinyint|smallint|mediumint|int|integer|bigint|date|' r'datetime|time|bit|bool|tinytext|mediumtext|longtext|text|' |