From 9dbcfd31abafe48ee7c646129c40e904ff0a5fac Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Mon, 16 Mar 2015 07:50:06 +0100 Subject: Support comments starting with '#' character (fixes #178). --- sqlparse/lexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sqlparse') diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py index 4707990..0a402c3 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -167,7 +167,7 @@ class Lexer(object): (r'--.*?(\r\n|\r|\n)', tokens.Comment.Single), # $ matches *before* newline, therefore we have two patterns # to match Comment.Single - (r'--.*?$', tokens.Comment.Single), + (r'(--|#).*?$', tokens.Comment.Single), (r'(\r\n|\r|\n)', tokens.Newline), (r'\s+', tokens.Whitespace), (r'/\*', tokens.Comment.Multiline, 'multiline-comments'), -- cgit v1.2.1 From f5e1a1add8aa4564cd24e2b3d13414b1fba68899 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Mon, 16 Mar 2015 07:56:01 +0100 Subject: Fix other regex to identify comments starting with '#' character. --- sqlparse/lexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sqlparse') diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py index 0a402c3..a1a4703 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -164,7 +164,7 @@ class Lexer(object): tokens = { 'root': [ - (r'--.*?(\r\n|\r|\n)', tokens.Comment.Single), + (r'(--|#).*?(\r\n|\r|\n)', tokens.Comment.Single), # $ matches *before* newline, therefore we have two patterns # to match Comment.Single (r'(--|#).*?$', tokens.Comment.Single), -- cgit v1.2.1 From ab827eaf935aba776715c4693ec9f320008a6708 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 12 Apr 2015 07:06:31 +0200 Subject: Update offset when adding line break (fixes 184). This change fixes a regression introduced in 8c5c0684ac61ab7d0c5e77881728c8106f2877f9. --- sqlparse/filters.py | 1 + 1 file changed, 1 insertion(+) (limited to 'sqlparse') diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 9c0a476..676344f 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -347,6 +347,7 @@ class ReindentFilter: nl = self.nl() added.add(nl) tlist.insert_before(token, nl) + offset += 1 token = _next_token(tlist.token_index(nl) + offset) def _split_statements(self, tlist): -- cgit v1.2.1 From f775030692222a5a0b296284328276b65259cc02 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 12 Apr 2015 07:37:01 +0200 Subject: Never interpret IN keyword as function name (fixes #183). --- sqlparse/lexer.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sqlparse') diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py index a1a4703..9533e8a 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -186,6 +186,9 @@ class Lexer(object): # see https://github.com/andialbrecht/sqlparse/pull/64 (r'VALUES', tokens.Keyword), (r'@[^\W\d_]\w+', tokens.Name), + # IN is special, it may be followed by a parenthesis, but + # is never a functino, see issue183 + (r'in\b(?=[ (])?', tokens.Keyword), (r'[^\W\d_]\w*(?=[.(])', tokens.Name), # see issue39 (r'[-]?0x[0-9a-fA-F]+', tokens.Number.Hexadecimal), (r'[-]?[0-9]*(\.[0-9]+)?[eE][-]?[0-9]+', tokens.Number.Float), -- cgit v1.2.1