diff options
| author | Mike Nolta <mike@nolta.net> | 2012-03-11 01:26:19 -0500 |
|---|---|---|
| committer | Mike Nolta <mike@nolta.net> | 2012-03-11 01:26:19 -0500 |
| commit | 086deed92ba378e3d8e37d18f1d0ce668967908d (patch) | |
| tree | 0bb94cca3f9be46317bc383751e2e8769be17813 /pygments/lexers/sql.py | |
| parent | 8db91bc577691c7f4ad2a649a734e5067ce58d32 (diff) | |
| parent | 9e80de2655ac91392e77fdb851cb8af940cff89d (diff) | |
| download | pygments-086deed92ba378e3d8e37d18f1d0ce668967908d.tar.gz | |
upstream pull
Diffstat (limited to 'pygments/lexers/sql.py')
| -rw-r--r-- | pygments/lexers/sql.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py index d5444fcb..656d29a7 100644 --- a/pygments/lexers/sql.py +++ b/pygments/lexers/sql.py @@ -147,14 +147,14 @@ class PostgresLexer(PostgresBase, RegexLexer): for s in DATATYPES + PSEUDO_TYPES]) + r')\b', Name.Builtin), (r'(' + '|'.join(KEYWORDS) + r')\b', Keyword), - (r'[+*/<>=~!@#%^&|`?^-]+', Operator), + (r'[+*/<>=~!@#%^&|`?-]+', Operator), (r'::', Operator), # cast (r'\$\d+', Name.Variable), (r'([0-9]*\.[0-9]*|[0-9]+)(e[+-]?[0-9]+)?', Number.Float), (r'[0-9]+', Number.Integer), (r"(E|U&)?'(''|[^'])*'", String.Single), (r'(U&)?"(""|[^"])*"', String.Name), # quoted identifier - (r'(?ms)(\$[^\$]*\$)(.*?)(\1)', language_callback), + (r'(?s)(\$[^\$]*\$)(.*?)(\1)', language_callback), (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), # psql variable in SQL @@ -434,7 +434,7 @@ class SqlLexer(RegexLexer): r'DEC|DECIMAL|FLOAT|INT|INTEGER|INTERVAL|NUMBER|NUMERIC|REAL|' r'SERIAL|SMALLINT|VARCHAR|VARYING|INT8|SERIAL8|TEXT)\b', Name.Builtin), - (r'[+*/<>=~!@#%^&|`?^-]', Operator), + (r'[+*/<>=~!@#%^&|`?-]', Operator), (r'[0-9]+', Number.Integer), # TODO: Backslash escapes? (r"'(''|[^'])*'", String.Single), @@ -472,7 +472,7 @@ class MySqlLexer(RegexLexer): (r"'(''|[^'])*'", String.Single), (r'"(""|[^"])*"', String.Double), (r"`(``|[^`])*`", String.Symbol), - (r'[+*/<>=~!@#%^&|`?^-]', Operator), + (r'[+*/<>=~!@#%^&|`?-]', Operator), (r'\b(tinyint|smallint|mediumint|int|integer|bigint|date|' r'datetime|time|bit|bool|tinytext|mediumtext|longtext|text|' r'tinyblob|mediumblob|longblob|blob|float|double|double\s+' |