From 7040e58e756334132743853608725dfc48867ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Sun, 18 Mar 2012 03:43:35 +0800 Subject: [PATCH] refactor --- .../wall/IllegalSQLObjectViolation.java | 2 +- .../druid/{filter => }/wall/Violation.java | 2 +- .../druid/{filter => }/wall/WallConfig.java | 6 ++--- .../druid/{filter => }/wall/WallFilter.java | 8 +++--- .../druid/{filter => }/wall/WallProvider.java | 2 +- .../wall/WallRuntimeException.java | 2 +- .../{filter => }/wall/WallSQLException.java | 2 +- .../druid/{filter => }/wall/WallUtils.java | 8 +++--- .../druid/{filter => }/wall/WallVisitor.java | 2 +- .../wall/spi/MySqlWallProvider.java | 8 +++--- .../wall/spi/MySqlWallVisitor.java | 10 +++---- .../wall/spi/OracleWallProvider.java | 8 +++--- .../wall/spi/OracleWallVisitor.java | 10 +++---- .../wall/spi/SQLServerProvider.java | 8 +++--- .../wall/spi/SQLServerWallVisitor.java | 10 +++---- .../wall/spi/WallVisitorUtils.java | 6 ++--- .../META-INF/druid-filter.properties | 2 +- .../bvt/filter/wall/MySqlWallLimitTest.java | 2 +- .../wall/MySqlWallLoadDataInfileTest.java | 2 +- .../wall/MySqlWallPermitFunctionTest.java | 2 +- .../filter/wall/MySqlWallPermitTableTest.java | 4 +-- .../wall/MySqlWallPermitVariantTest.java | 4 +-- .../druid/bvt/filter/wall/MySqlWallTest.java | 2 +- .../wall/OracleWallPermitFunctionTest.java | 4 +-- .../wall/OracleWallPermitObjectTest.java | 4 +-- .../wall/OracleWallPermitSchemaTest.java | 2 +- .../wall/OracleWallPermitTableTest.java | 2 +- .../wall/OracleWallPermitVariantTest.java | 4 +-- .../wall/OracleWallPermitVariantTest2.java | 2 +- .../druid/bvt/filter/wall/OracleWallTest.java | 2 +- .../wall/SQLServerWallPermitTableTest.java | 2 +- .../bvt/filter/wall/SQLServerWallTest.java | 2 +- .../druid/bvt/filter/wall/WallDeleteTest.java | 4 +-- .../bvt/filter/wall/WallDeleteWhereTest.java | 2 +- .../bvt/filter/wall/WallDeleteWhereTest1.java | 2 +- .../druid/bvt/filter/wall/WallDropTest.java | 2 +- .../druid/bvt/filter/wall/WallDropTest1.java | 4 +-- .../druid/bvt/filter/wall/WallHavingTest.java | 2 +- .../druid/bvt/filter/wall/WallInsertTest.java | 4 +-- .../bvt/filter/wall/WallInsertTest2.java | 4 +-- .../bvt/filter/wall/WallLineCommentTest.java | 2 +- .../filter/wall/WallMultiLineCommentTest.java | 2 +- .../filter/wall/WallMultiStatementTest.java | 2 +- .../bvt/filter/wall/WallSelectIntoTest.java | 2 +- .../bvt/filter/wall/WallSelectIntoTest1.java | 4 +-- .../bvt/filter/wall/WallSelectWhereTest.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest0.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest1.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest2.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest3.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest4.java | 2 +- .../bvt/filter/wall/WallSelectWhereTest5.java | 2 +- .../bvt/filter/wall/WallTruncateTest.java | 4 +-- .../bvt/filter/wall/WallTruncateTest1.java | 4 +-- .../druid/bvt/filter/wall/WallUnionTest.java | 2 +- .../druid/bvt/filter/wall/WallUnionTest2.java | 2 +- .../druid/bvt/filter/wall/WallUnionTest3.java | 2 +- .../druid/bvt/filter/wall/WallUnionTest4.java | 2 +- .../druid/bvt/filter/wall/WallUpdateTest.java | 4 +-- .../bvt/filter/wall/WallUpdateTest1.java | 4 +-- .../bvt/filter/wall/WallUpdateTest2.java | 4 +-- .../bvt/filter/wall/WallUpdateTest3.java | 4 +-- .../bvt/filter/wall/WallUpdateTest4.java | 4 +-- .../bvt/filter/wall/WallUpdateWhereTest.java | 2 +- .../bvt/filter/wall/WallVisitorUtilsTest.java | 2 +- .../sql/sqlserver/SQLServerSelectTest1.java | 26 +++++++++++++++++++ .../alibaba/druid/pool/spring-config-1.xml | 4 +-- 67 files changed, 141 insertions(+), 115 deletions(-) rename src/main/java/com/alibaba/druid/{filter => }/wall/IllegalSQLObjectViolation.java (92%) rename src/main/java/com/alibaba/druid/{filter => }/wall/Violation.java (58%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallConfig.java (97%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallFilter.java (98%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallProvider.java (98%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallRuntimeException.java (91%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallSQLException.java (91%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallUtils.java (83%) rename src/main/java/com/alibaba/druid/{filter => }/wall/WallVisitor.java (89%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/MySqlWallProvider.java (77%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/MySqlWallVisitor.java (96%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/OracleWallProvider.java (77%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/OracleWallVisitor.java (96%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/SQLServerProvider.java (77%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/SQLServerWallVisitor.java (91%) rename src/main/java/com/alibaba/druid/{filter => }/wall/spi/WallVisitorUtils.java (99%) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java diff --git a/src/main/java/com/alibaba/druid/filter/wall/IllegalSQLObjectViolation.java b/src/main/java/com/alibaba/druid/wall/IllegalSQLObjectViolation.java similarity index 92% rename from src/main/java/com/alibaba/druid/filter/wall/IllegalSQLObjectViolation.java rename to src/main/java/com/alibaba/druid/wall/IllegalSQLObjectViolation.java index 9a2635150b..83f118ea2a 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/IllegalSQLObjectViolation.java +++ b/src/main/java/com/alibaba/druid/wall/IllegalSQLObjectViolation.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; public class IllegalSQLObjectViolation implements Violation { diff --git a/src/main/java/com/alibaba/druid/filter/wall/Violation.java b/src/main/java/com/alibaba/druid/wall/Violation.java similarity index 58% rename from src/main/java/com/alibaba/druid/filter/wall/Violation.java rename to src/main/java/com/alibaba/druid/wall/Violation.java index a1c19421ef..7b6c812211 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/Violation.java +++ b/src/main/java/com/alibaba/druid/wall/Violation.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; public interface Violation { diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java b/src/main/java/com/alibaba/druid/wall/WallConfig.java similarity index 97% rename from src/main/java/com/alibaba/druid/filter/wall/WallConfig.java rename to src/main/java/com/alibaba/druid/wall/WallConfig.java index 0f6ef3d14a..a7bec63519 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java +++ b/src/main/java/com/alibaba/druid/wall/WallConfig.java @@ -1,11 +1,11 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; -import static com.alibaba.druid.filter.wall.spi.WallVisitorUtils.loadResource; +import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource; import java.util.HashSet; import java.util.Set; -import com.alibaba.druid.filter.wall.spi.WallVisitorUtils; +import com.alibaba.druid.wall.spi.WallVisitorUtils; public class WallConfig { diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java similarity index 98% rename from src/main/java/com/alibaba/druid/filter/wall/WallFilter.java rename to src/main/java/com/alibaba/druid/wall/WallFilter.java index 9319b55cc0..47cb5552d0 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; import java.sql.SQLException; import java.util.List; @@ -7,9 +7,6 @@ import java.util.Properties; import com.alibaba.druid.DruidRuntimeException; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.filter.wall.spi.MySqlWallProvider; -import com.alibaba.druid.filter.wall.spi.OracleWallProvider; -import com.alibaba.druid.filter.wall.spi.SQLServerProvider; import com.alibaba.druid.logging.Log; import com.alibaba.druid.logging.LogFactory; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; @@ -19,6 +16,9 @@ import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.wall.spi.MySqlWallProvider; +import com.alibaba.druid.wall.spi.OracleWallProvider; +import com.alibaba.druid.wall.spi.SQLServerProvider; public class WallFilter extends FilterAdapter { diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java similarity index 98% rename from src/main/java/com/alibaba/druid/filter/wall/WallProvider.java rename to src/main/java/com/alibaba/druid/wall/WallProvider.java index 6c4d10ab91..1d1811888c 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallRuntimeException.java b/src/main/java/com/alibaba/druid/wall/WallRuntimeException.java similarity index 91% rename from src/main/java/com/alibaba/druid/filter/wall/WallRuntimeException.java rename to src/main/java/com/alibaba/druid/wall/WallRuntimeException.java index 9853920f84..9f6c0289b6 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallRuntimeException.java +++ b/src/main/java/com/alibaba/druid/wall/WallRuntimeException.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; public class WallRuntimeException extends RuntimeException { diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallSQLException.java b/src/main/java/com/alibaba/druid/wall/WallSQLException.java similarity index 91% rename from src/main/java/com/alibaba/druid/filter/wall/WallSQLException.java rename to src/main/java/com/alibaba/druid/wall/WallSQLException.java index e07357a9d4..912ee2bf75 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallSQLException.java +++ b/src/main/java/com/alibaba/druid/wall/WallSQLException.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; import java.sql.SQLException; diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java b/src/main/java/com/alibaba/druid/wall/WallUtils.java similarity index 83% rename from src/main/java/com/alibaba/druid/filter/wall/WallUtils.java rename to src/main/java/com/alibaba/druid/wall/WallUtils.java index 1d786fab74..722a52000c 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java +++ b/src/main/java/com/alibaba/druid/wall/WallUtils.java @@ -1,8 +1,8 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; -import com.alibaba.druid.filter.wall.spi.MySqlWallProvider; -import com.alibaba.druid.filter.wall.spi.OracleWallProvider; -import com.alibaba.druid.filter.wall.spi.SQLServerProvider; +import com.alibaba.druid.wall.spi.MySqlWallProvider; +import com.alibaba.druid.wall.spi.OracleWallProvider; +import com.alibaba.druid.wall.spi.SQLServerProvider; public class WallUtils { diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallVisitor.java b/src/main/java/com/alibaba/druid/wall/WallVisitor.java similarity index 89% rename from src/main/java/com/alibaba/druid/filter/wall/WallVisitor.java rename to src/main/java/com/alibaba/druid/wall/WallVisitor.java index db434abf60..9306d063f1 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/WallVisitor.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall; +package com.alibaba.druid.wall; import java.util.List; diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java similarity index 77% rename from src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java rename to src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java index 29423cba44..68833fdbcf 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallProvider.java @@ -1,10 +1,10 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallProvider; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; public class MySqlWallProvider extends WallProvider { diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java similarity index 96% rename from src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java rename to src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java index fb42d1131c..9433fc35b3 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java @@ -1,12 +1,8 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.filter.wall.IllegalSQLObjectViolation; -import com.alibaba.druid.filter.wall.Violation; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -33,6 +29,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; +import com.alibaba.druid.wall.IllegalSQLObjectViolation; +import com.alibaba.druid.wall.Violation; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallVisitor; public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisitor, MySqlASTVisitor { diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java similarity index 77% rename from src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java rename to src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java index f8e3997aff..74ec5d7e99 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallProvider.java @@ -1,10 +1,10 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallProvider; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; public class OracleWallProvider extends WallProvider { diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java similarity index 96% rename from src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java rename to src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java index 2bc5c39944..bd577b6ea4 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java @@ -1,12 +1,8 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.filter.wall.IllegalSQLObjectViolation; -import com.alibaba.druid.filter.wall.Violation; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -32,6 +28,10 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVIsitorAdapter; +import com.alibaba.druid.wall.IllegalSQLObjectViolation; +import com.alibaba.druid.wall.Violation; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallVisitor; public class OracleWallVisitor extends OracleASTVIsitorAdapter implements WallVisitor { diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerProvider.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerProvider.java similarity index 77% rename from src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerProvider.java rename to src/main/java/com/alibaba/druid/wall/spi/SQLServerProvider.java index d4bfbc3e37..18cef9e7d2 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerProvider.java @@ -1,10 +1,10 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallProvider; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; /** * SQLServerProvider diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java similarity index 91% rename from src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerWallVisitor.java rename to src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java index b9eecc23f8..21b6a44e84 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/SQLServerWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java @@ -1,12 +1,8 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.filter.wall.IllegalSQLObjectViolation; -import com.alibaba.druid.filter.wall.Violation; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -26,6 +22,10 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitorAdapter; +import com.alibaba.druid.wall.IllegalSQLObjectViolation; +import com.alibaba.druid.wall.Violation; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallVisitor; public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements WallVisitor, SQLServerASTVisitor{ diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java similarity index 99% rename from src/main/java/com/alibaba/druid/filter/wall/spi/WallVisitorUtils.java rename to src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index cc14809ceb..8ccfba087a 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -1,4 +1,4 @@ -package com.alibaba.druid.filter.wall.spi; +package com.alibaba.druid.wall.spi; import java.io.BufferedReader; import java.io.IOException; @@ -8,8 +8,6 @@ import java.net.URL; import java.util.Enumeration; import java.util.Set; -import com.alibaba.druid.filter.wall.IllegalSQLObjectViolation; -import com.alibaba.druid.filter.wall.WallVisitor; import com.alibaba.druid.logging.Log; import com.alibaba.druid.logging.LogFactory; import com.alibaba.druid.sql.ast.SQLExpr; @@ -41,6 +39,8 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.wall.IllegalSQLObjectViolation; +import com.alibaba.druid.wall.WallVisitor; public class WallVisitorUtils { diff --git a/src/main/resources/META-INF/druid-filter.properties b/src/main/resources/META-INF/druid-filter.properties index 9feea335b5..fb95e1a114 100644 --- a/src/main/resources/META-INF/druid-filter.properties +++ b/src/main/resources/META-INF/druid-filter.properties @@ -7,4 +7,4 @@ druid.filters.slf4j=com.alibaba.druid.filter.logging.Slf4jLogFilter druid.filters.commonlogging=com.alibaba.druid.filter.logging.CommonsLogFilter druid.filters.commonLogging=com.alibaba.druid.filter.logging.CommonsLogFilter druid.filters.trace=com.alibaba.druid.filter.trace.TraceFilter -druid.filters.wall=com.alibaba.druid.filter.wall.WallFilter \ No newline at end of file +druid.filters.wall=com.alibaba.druid.wall.WallFilter \ No newline at end of file diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLimitTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLimitTest.java index f6d9a80650..af43871816 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLimitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLimitTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLoadDataInfileTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLoadDataInfileTest.java index bee14922c8..814e34f7f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLoadDataInfileTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallLoadDataInfileTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitFunctionTest.java index 3e475a2ef0..062a8e5978 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitFunctionTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitTableTest.java index 41ecd14eea..3db7de3ea1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitTableTest.java @@ -2,8 +2,8 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitVariantTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitVariantTest.java index cf0975113d..8032dff2f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitVariantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallPermitVariantTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest.java index 0470be8bd2..be0133977e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitFunctionTest.java index 8f6b152a0c..39b73f1533 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitFunctionTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitObjectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitObjectTest.java index dc6fa4adc6..e981c93d0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitObjectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitObjectTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitSchemaTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitSchemaTest.java index b6810f83c0..61bfb6891d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitSchemaTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitSchemaTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitTableTest.java index a9412b0d3d..1d0bf4bf41 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitTableTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest.java index 73798f8998..f6c5c6d6c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest2.java index 9f8c44d9aa..0a461618a3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallPermitVariantTest2.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问Oracle系统对象 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallTest.java index f19c68ab73..5239d8bf76 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/OracleWallTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; public class OracleWallTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitTableTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitTableTest.java index 3d27ccef27..b02f2ffb52 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitTableTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景测试访问SQLServer系统表 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest.java index c6a1174997..6253f0d1da 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.wall; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java index db6a36a2d3..b281eeda90 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java index 163c15e758..d05ff38625 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java index 597a952f56..1dc2171486 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java index 4bdd3d2512..a8feb7319b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java index 7f15a29bfa..e7f5d651bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java index d57e658b5f..0c7c8389be 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java index 46e01809fe..ad94432199 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java index cf2b97f2af..86131478fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java index 5b9200a29d..09b984b3b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 测试单行注释的场景 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java index cdfc633e72..10c5392ad1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 测试多行注释的场景 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java index ae6bb0c001..bb988913e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 测试禁止多条语句执行的场景 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java index 82b2178952..edbbb0dbac 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java index 7d58f2bd64..1f14d561de 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java index 650a4a0f9f..9fdf911616 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java index 1fa9eac184..8240b47b8f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java index af8bc2c516..eba4adf25b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java index fa91d2e3f7..e71d28c0fc 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java index b5001ee521..897e6e8e14 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java index 02abcffe1e..a6bbd94a08 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Where条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java index d80589909b..100c190b90 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java index 45b834c498..ceb4ffd34a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java index 95260b5ecb..63c69f7118 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java index 1e95c1f30d..4f1182b841 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java index 982115969f..a87f550085 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java index 6a2027ca75..011956f8bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java index fe0e711fbd..2733803553 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java index 7df4c5d5e0..3bf64cb5f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java index 1f38a72fa4..83024912d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java index 8e8a91f48c..11711ac511 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java index 373d86bb33..7f7c45f58c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java index 262d3a6beb..7d6eafc964 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java @@ -4,8 +4,8 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallConfig; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java index 1718b2ee4c..b483567520 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.junit.Assert; -import com.alibaba.druid.filter.wall.WallUtils; +import com.alibaba.druid.wall.WallUtils; /** * 这个场景，检测可疑的Having条件 diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java index 20956cd203..d697664ecb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java @@ -3,8 +3,8 @@ package com.alibaba.druid.bvt.filter.wall; import junit.framework.Assert; import junit.framework.TestCase; -import com.alibaba.druid.filter.wall.spi.WallVisitorUtils; import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.wall.spi.WallVisitorUtils; public class WallVisitorUtilsTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java new file mode 100644 index 0000000000..a1c4027be4 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest1.java @@ -0,0 +1,26 @@ +package com.alibaba.druid.bvt.sql.sqlserver; + +import junit.framework.Assert; +import junit.framework.TestCase; + +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; +import com.alibaba.druid.sql.test.TestUtils; + +public class SQLServerSelectTest1 extends TestCase { + + public void test_isEmpty() throws Exception { + String sql = "USE AdventureWorks2008R2;"; + + String expect = "USE AdventureWorks2008R2"; + + SQLServerStatementParser parser = new SQLServerStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + + String text = TestUtils.outputSqlServer(stmt); + + Assert.assertEquals(expect, text); + + System.out.println(text); + } +} diff --git a/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml b/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml index df73514edd..ebe222e71b 100644 --- a/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml +++ b/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml @@ -12,12 +12,12 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/ - - +