From 2fcbee71724dd6311afe5a88106c4591bc1914ee Mon Sep 17 00:00:00 2001
From: Victor Uriarte <victor.m.uriarte@intel.com>
Date: Fri, 3 Jun 2016 11:24:56 -0700
Subject: Rewrite wildcard and placeholder regex

---
 sqlparse/keywords.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'sqlparse')

diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index a14fa55..9c4495b 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -28,15 +28,18 @@ SQL_REGEX = {
 
         (r':=', tokens.Assignment),
         (r'::', tokens.Punctuation),
-        (r'[*]', tokens.Wildcard),
+
+        (r'\*', tokens.Wildcard),
+
         (r'CASE\b', tokens.Keyword),  # extended CASE(foo)
         (r"`(``|[^`])*`", tokens.Name),
         (r"´(´´|[^´])*´", tokens.Name),
         (r'\$([^\W\d]\w*)?\$', tokens.Name.Builtin),
-        (r'\?{1}', tokens.Name.Placeholder),
-        (r'%\(\w+\)s', tokens.Name.Placeholder),
-        (r'%s', tokens.Name.Placeholder),
+
+        (r'\?', tokens.Name.Placeholder),
+        (r'%(\(\w+\))?s', tokens.Name.Placeholder),
         (r'[$:?]\w+', tokens.Name.Placeholder),
+
         # FIXME(andi): VALUES shouldn't be listed here
         # see https://github.com/andialbrecht/sqlparse/pull/64
         (r'VALUES', tokens.Keyword),
-- 
cgit v1.2.1