improve wall filter

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java

@@ -203,12 +203,12 @@ public class MySqlLexer extends Lexer {
             }
         }
     }
-    
+
     protected final void scanString() {
         {
             boolean hasSpecial = false;
             int startIndex = pos + 1;
-            int endIndex = -1; //text.indexOf('\'', startIndex);
+            int endIndex = -1; // text.indexOf('\'', startIndex);
             for (int i = startIndex; i < text.length(); ++i) {
                 final char ch = text.charAt(i);
                 if (ch == '\\') {
@@ -219,13 +219,13 @@ public class MySqlLexer extends Lexer {
                     break;
                 }
             }
-            
+
             if (endIndex == -1) {
                 throw new ParserException("unclosed str");
             }
 
             String stringVal = subString(startIndex, endIndex - startIndex);
-//            hasSpecial = stringVal.indexOf('\\') != -1;
+            // hasSpecial = stringVal.indexOf('\\') != -1;
 
             if (!hasSpecial) {
                 this.stringVal = stringVal;
@@ -328,6 +328,8 @@ public class MySqlLexer extends Lexer {
     }
 
     public void scanComment() {
+        Token lastToken = this.token;
+
         if (ch != '/' && ch != '-') {
             throw new IllegalStateException();
         }
@@ -374,8 +376,14 @@ public class MySqlLexer extends Lexer {
                 token = Token.MULTI_LINE_COMMENT;
             }
 
-            if (token != Token.HINT && !isAllowComment()) {
-                throw new NotAllowCommentException();
+            if (token != Token.HINT) {
+                if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) {
+                    return;
+                }
+                
+                if (!isAllowComment()) {
+                    throw new NotAllowCommentException();
+                }
             }
 
             return;

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java

@@ -64,10 +64,15 @@ public class MySqlSelectParser extends SQLSelectParser {
 
         if (lexer.token() == Token.SELECT) {
             lexer.nextToken();
+            
 
             if (lexer.token() == Token.HINT) {
                 this.exprParser.parseHints(queryBlock.getHints());
             }
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             if (lexer.token() == (Token.DISTINCT)) {
                 queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java

@@ -235,6 +235,10 @@ public class MySqlStatementParser extends SQLStatementParser {
 
         if (lexer.token() == Token.DELETE) {
             lexer.nextToken();
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             if (identifierEquals(LOW_PRIORITY)) {
                 deleteStatement.setLowPriority(true);

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java

@@ -244,6 +244,10 @@ public class OracleSelectParser extends SQLSelectParser {
         OracleSelectQueryBlock queryBlock = new OracleSelectQueryBlock();
         if (lexer.token() == Token.SELECT) {
             lexer.nextToken();
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             parseHints(queryBlock);
 

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java

@@ -1462,6 +1462,10 @@ public class OracleStatementParser extends SQLStatementParser {
 
         if (lexer.token() == Token.DELETE) {
             lexer.nextToken();
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             parseHints(deleteStatement.getHints());
 

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java

@@ -66,6 +66,11 @@ public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatem
     public List<ValuesClause> getValuesList() {
         return valuesList;
     }
+    
+    public void addValueCause(ValuesClause valueClause) {
+        valueClause.setParent(this);
+        valuesList.add(valueClause);
+    }
 
     protected void accept0(SQLASTVisitor visitor) {
         accept0((PGASTVisitor) visitor);

src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java

@@ -110,9 +110,10 @@ public class PGSQLStatementParser extends SQLStatementParser {
 
             for (;;) {
                 accept(Token.LPAREN);
-                SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause();
-                this.exprParser.exprList(values.getValues());
-                stmt.getValuesList().add(values);
+                SQLInsertStatement.ValuesClause valuesCaluse = new SQLInsertStatement.ValuesClause();
+                this.exprParser.exprList(valuesCaluse.getValues());
+                stmt.addValueCause(valuesCaluse);
+                
                 accept(Token.RPAREN);
                 if (lexer.token() == Token.COMMA) {
                     lexer.nextToken();

src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSelectParser.java

@@ -52,6 +52,10 @@ public class PGSelectParser extends SQLSelectParser {
 
         if (lexer.token() == Token.SELECT) {
             lexer.nextToken();
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             if (lexer.token() == Token.DISTINCT) {
                 queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java

@@ -66,6 +66,10 @@ public class SQLServerSelectParser extends SQLSelectParser {
 
         if (lexer.token() == Token.SELECT) {
             lexer.nextToken();
+            
+            if (lexer.token() == Token.COMMENT) {
+                lexer.nextToken();
+            }
 
             if (lexer.token() == Token.DISTINCT) {
                 queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);