From 994278a555be3662a88faf98065512e7161310fc Mon Sep 17 00:00:00 2001 From: xiusiyan Date: Sun, 18 Mar 2012 22:38:33 +0800 Subject: [PATCH 1/2] refactor --- .../resources/META-INF/druid/wall/sqlserver/permit-schema.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt b/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt index e69de29bb2..8b25206ff9 100644 --- a/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt +++ b/src/main/resources/META-INF/druid/wall/sqlserver/permit-schema.txt @@ -0,0 +1 @@ +master \ No newline at end of file From 88f03e5340c42070e2c4fca25a6e58175de5c4ca Mon Sep 17 00:00:00 2001 From: xiusiyan Date: Sun, 18 Mar 2012 22:39:31 +0800 Subject: [PATCH 2/2] refactor --- .../com/alibaba/druid/wall/spi/SQLServerWallVisitor.java | 2 +- .../bvt/filter/wall/SQLServerWallPermitFunctionTest.java | 4 +--- .../bvt/filter/wall/SQLServerWallPermitObjectTest.java | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java index 7b6c13fd1f..4d99362d61 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java @@ -63,7 +63,7 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements @Override public String toSQL(SQLObject obj) { - return SQLUtils.toMySqlString(obj); + return SQLUtils.toSQLServerString(obj); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java index b30fdca15f..c436a9a6c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitFunctionTest.java @@ -82,7 +82,5 @@ public class SQLServerWallPermitFunctionTest extends TestCase { Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT is_srvrolemember(‘sysadmin’, ‘sa’); ")); } - public void test_system_user() throws Exception { - Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT system_user;")); - } + } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitObjectTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitObjectTest.java index 5a2ef21878..290cc30100 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitObjectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallPermitObjectTest.java @@ -36,7 +36,11 @@ public class SQLServerWallPermitObjectTest extends TestCase { super.tearDown(); } - public void test01() throws Exception { + public void test_user() throws Exception { Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT user;")); } + + public void test_system_user() throws Exception { + Assert.assertFalse(WallUtils.isValidateSqlServer("SELECT system_user;")); + } }