From d47b1210af268e7d7688b31542fa42f0ac1812e8 Mon Sep 17 00:00:00 2001 From: yakolee Date: Wed, 9 Jul 2014 21:21:57 +0800 Subject: [PATCH] improve sqlwall --- .../com/alibaba/druid/wall/WallProvider.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/druid/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java index b5dc28d278..64eec2e5d4 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java @@ -641,7 +641,9 @@ public abstract class WallProvider { violations.add(new SyntaxErrorViolation(e, sql)); } } catch (Exception e) { - violations.add(new SyntaxErrorViolation(e, sql)); + if (config.isStrictSyntaxCheck()) { + violations.add(new SyntaxErrorViolation(e, sql)); + } } if (statementList.size() > 1 && !config.isMultiStatementAllow()) { @@ -664,15 +666,15 @@ public abstract class WallProvider { violations.addAll(visitor.getViolations()); } - if (visitor.getViolations().size() == 0 && context != null && context.getWarnnings() >= 2) { - if (context.getCommentCount() > 0) { - violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "comment not allow", sql)); - } else if (context.getLikeNumberWarnnings() > 0) { - violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "like number", sql)); - } else { - violations.add(new IllegalSQLObjectViolation(ErrorCode.COMPOUND, "multi-warnnings", sql)); - } - } + // if (visitor.getViolations().size() == 0 && context != null && context.getWarnnings() >= 2) { + // if (context.getCommentCount() > 0) { + // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "comment not allow", sql)); + // } else if (context.getLikeNumberWarnnings() > 0) { + // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "like number", sql)); + // } else { + // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMPOUND, "multi-warnnings", sql)); + // } + // } WallSqlStat sqlStat = null; if (violations.size() > 0) {