improve sqlwall: update

src/main/java/com/alibaba/druid/sql/SQLUtils.java

@@ -117,6 +117,10 @@ public class SQLUtils {
         return format(sql, JdbcUtils.ODPS);
     }
 
+    public static String formatSQLServer(String sql) {
+        return format(sql, JdbcUtils.SQL_SERVER);
+    }
+    
     public static String toOracleString(SQLObject sqlObject) {
         StringBuilder out = new StringBuilder();
         sqlObject.accept(new OracleOutputVisitor(out, false));

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

@@ -1994,10 +1994,15 @@ public class MySqlStatementParser extends SQLStatementParser {
                 SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(new ArrayList<SQLExpr>(0));
                 valueClauseList.add(values);
             }
-
+            
             if (lexer.token() != Token.RPAREN) {
                 throw new ParserException("syntax error");
             }
+            
+            if (!parseCompleteValues && valueClauseList.size() >= parseValuesSize) {
+                lexer.skipToEOF();
+                break;
+            }
 
             lexer.nextTokenComma();
             if (lexer.token() == Token.COMMA) {

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

@@ -123,6 +123,11 @@ public class SQLServerStatementParser extends SQLStatementParser {
                 insertStatement.getValuesList().add(values);
                 accept(Token.RPAREN);
 
+                if (!parseCompleteValues && insertStatement.getValuesList().size() >= parseValuesSize) {
+                    lexer.skipToEOF();
+                    break;
+                }
+                
                 if (lexer.token() == Token.COMMA) {
                     lexer.nextToken();
                     continue;

src/main/java/com/alibaba/druid/sql/parser/Lexer.java

@@ -1053,4 +1053,9 @@ public class Lexer {
     public boolean isHasComment() {
         return hasComment;
     }
+    
+    public void skipToEOF() {
+        pos = text.length();
+        this.token = Token.EOF;
+    }
 }

src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java

@@ -85,6 +85,10 @@ public class SQLStatementParser extends SQLParser {
 
     protected SQLExprParser exprParser;
 
+    protected boolean       parseCompleteValues = true;
+
+    protected int           parseValuesSize     = 3;
+
     public SQLStatementParser(String sql){
         this(new SQLExprParser(sql));
     }
@@ -1569,4 +1573,21 @@ public class SQLStatementParser extends SQLParser {
         accept(Token.RPAREN);
         return item;
     }
+
+    
+    public boolean isParseCompleteValues() {
+        return parseCompleteValues;
+    }
+
+    public void setParseCompleteValues(boolean parseCompleteValues) {
+        this.parseCompleteValues = parseCompleteValues;
+    }
+
+    public int getParseValuesSize() {
+        return parseValuesSize;
+    }
+
+    public void setParseValuesSize(int parseValuesSize) {
+        this.parseValuesSize = parseValuesSize;
+    }
 }

src/main/java/com/alibaba/druid/wall/WallConfig.java

@@ -119,6 +119,9 @@ public class WallConfig implements WallConfigMBean {
     private boolean             conditionOpBitwseAllow      = true;
 
     private boolean             caseConditionConstAllow     = false;
+    
+    private boolean             completeInsertValuesCheck   = false;
+    private int                 insertValuesCheckSize       = 3;
 
     public WallConfig(){
 
@@ -770,4 +773,20 @@ public class WallConfig implements WallConfigMBean {
         this.startTransactionAllow = startTransactionAllow;
     }
 
+    public boolean isCompleteInsertValuesCheck() {
+        return completeInsertValuesCheck;
+    }
+
+    public void setCompleteInsertValuesCheck(boolean completeInsertValuesCheck) {
+        this.completeInsertValuesCheck = completeInsertValuesCheck;
+    }
+
+    public int getInsertValuesCheckSize() {
+        return insertValuesCheckSize;
+    }
+
+    public void setInsertValuesCheckSize(int insertValuesCheckSize) {
+        this.insertValuesCheckSize = insertValuesCheckSize;
+    }
+
 }

src/main/java/com/alibaba/druid/wall/WallProvider.java

@@ -611,7 +611,11 @@ public abstract class WallProvider {
             if (!config.isCommentAllow()) {
                 parser.getLexer().setAllowComment(false); // deny comment
             }
-
+            if (!config.isCompleteInsertValuesCheck()) {
+                parser.setParseCompleteValues(false);
+                parser.setParseValuesSize(config.getInsertValuesCheckSize());
+            }
+            
             parser.parseStatementList(statementList);
 
             final Token lastToken = parser.getLexer().token();