improve wall filter

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest80.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+/**
+ * SQLServerWallTest
+ * 
+ * @author RaymondXiu
+ * @version 1.0, 2012-3-18
+ * @see
+ */
+public class MySqlWallTest80 extends TestCase {
+
+    public void test_true() throws Exception {
+        WallProvider provider = new MySqlWallProvider();
+
+        Assert.assertTrue(provider.checkValid(//
+        "SELECT * FROM T WHERE FID = ? OR FID LIKE 1"));
+
+        Assert.assertEquals(1, provider.getTableStats().size());
+    }
+
+    public void test_false() throws Exception {
+        WallProvider provider = new MySqlWallProvider();
+
+        provider.getConfig().setCommentAllow(true);
+
+        Assert.assertFalse(provider.checkValid(//
+        "SELECT * FROM T WHERE FID = ? OR FID LIKE 1 --"));
+
+        Assert.assertEquals(1, provider.getTableStats().size());
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest81.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+/**
+ * SQLServerWallTest
+ * 
+ * @author RaymondXiu
+ * @version 1.0, 2012-3-18
+ * @see
+ */
+public class MySqlWallTest81 extends TestCase {
+
+    public void test_false() throws Exception {
+        WallProvider provider = new MySqlWallProvider();
+        provider.getConfig().setStrictSyntaxCheck(false);
+        
+        Assert.assertFalse(provider.checkValid(//
+        "SELECT * FROM T WHERE FID = '\\'a' OR LEAST(2,1,9,8) = 1"));
+
+        Assert.assertEquals(1, provider.getTableStats().size());
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest82.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+/**
+ * SQLServerWallTest
+ * 
+ * @author RaymondXiu
+ * @version 1.0, 2012-3-18
+ * @see
+ */
+public class MySqlWallTest82 extends TestCase {
+
+    public void test_false() throws Exception {
+        WallProvider provider = new MySqlWallProvider();
+        provider.getConfig().setStrictSyntaxCheck(false);
+        
+        Assert.assertFalse(provider.checkValid(//
+        "SELECT * FROM T WHERE FID = '\0a' OR LEAST(2,1,9,8) = 1"));
+
+        Assert.assertEquals(1, provider.getTableStats().size());
+    }
+
+}

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_like_1.java

@@ -34,7 +34,7 @@ public class MySqlWallTest_like_1 extends TestCase {
     public void test_false() throws Exception {
         WallProvider provider = new MySqlWallProvider();
         
-        Assert.assertFalse(provider.checkValid(//
+        Assert.assertTrue(provider.checkValid(//
         "SELECT * FROM T WHERE FID = ? OR FID LIKE 1"));
 
         Assert.assertEquals(1, provider.getTableStats().size());

src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java

@@ -48,6 +48,6 @@ public class TenantSelectTest2 extends TestCase {
                             "\nFROM orders" + //
                             "\nWHERE tenant = 123" + //
                             "\n\tAND (FID = ?" +
-                            "\n\t\t\tOR FID = ?)", resultSql);
+                            "\n\t\tOR FID = ?)", resultSql);
     }
 }

src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java

@@ -52,6 +52,6 @@ public class TenantSelectTest3 extends TestCase {
                             "\n\t\tAND o.userid = u.id" + //
                             "\nWHERE o.tenant = 123" + //
                             "\n\tAND (FID = ?" + //
-                            "\n\t\t\tOR FID = ?)", resultSql);
+                            "\n\t\tOR FID = ?)", resultSql);
     }
 }