WallFilter improve multi-tenant support

src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java

@@ -942,19 +942,25 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter {
     @Override
     public boolean visit(SQLJoinTableSource x) {
         x.getLeft().accept(this);
+        incrementIndent();
+        
         if (x.getJoinType() == JoinType.COMMA) {
             print(",");
         } else {
-            print(" ");
+            println();
             print(JoinType.toString(x.getJoinType()));
         }
         print(" ");
         x.getRight().accept(this);
 
         if (x.getCondition() != null) {
+            incrementIndent();
             print(" ON ");
             x.getCondition().accept(this);
+            decrementIndent();
         }
+        
+        decrementIndent();
 
         return false;
     }

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

@@ -28,6 +28,8 @@ public interface WallVisitor extends SQLASTVisitor {
 
     List<Violation> getViolations();
     
+    void addViolation(Violation violation);
+    
     boolean isPermitTable(String name);
 
     String toSQL(SQLObject obj);

src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java

@@ -71,6 +71,10 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi
     public WallConfig getConfig() {
         return config;
     }
+    
+    public void addViolation(Violation violation) {
+        this.violations.add(violation);
+    }
 
     public List<Violation> getViolations() {
         return violations;

src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java

@@ -71,6 +71,10 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi
         return config;
     }
 
+    public void addViolation(Violation violation) {
+        this.violations.add(violation);
+    }
+    
     public List<Violation> getViolations() {
         return violations;
     }

src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java

@@ -68,6 +68,10 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements
         return this.config;
     }
 
+    public void addViolation(Violation violation) {
+        this.violations.add(violation);
+    }
+    
     @Override
     public List<Violation> getViolations() {
         return violations;

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

@@ -0,0 +1,51 @@
+/*
+ * 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.sql.SQLUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.wall.WallCheckResult;
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+public class TenantDeleteTest extends TestCase {
+
+    private String     sql    = "DELETE FROM orders WHERE FID = ?";
+
+    private WallConfig config = new WallConfig();
+
+    protected void setUp() throws Exception {
+        config.setTenantTablePattern("*");
+        config.setTenantColumn("tenant");
+    }
+
+    public void testMySql() throws Exception {
+        WallProvider.setTenantValue(123);
+        MySqlWallProvider provider = new MySqlWallProvider(config);
+        WallCheckResult checkResult = provider.check(sql);
+        Assert.assertEquals(0, checkResult.getViolations().size());
+
+        String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL);
+        Assert.assertEquals("DELETE FROM orders" + //
+                            "\nWHERE tenant = 123" + //
+                            "\n\tAND FID = ?", resultSql);
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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.sql.SQLUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.wall.WallCheckResult;
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+public class TenantSelectTest extends TestCase {
+
+    private String     sql    = "SELECT ID, NAME FROM orders WHERE FID = ?";
+
+    private WallConfig config = new WallConfig();
+
+    protected void setUp() throws Exception {
+        config.setTenantTablePattern("*");
+        config.setTenantColumn("tenant");
+    }
+
+    public void testMySql() throws Exception {
+        WallProvider.setTenantValue(123);
+        MySqlWallProvider provider = new MySqlWallProvider(config);
+        WallCheckResult checkResult = provider.check(sql);
+        Assert.assertEquals(0, checkResult.getViolations().size());
+
+        String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL);
+        Assert.assertEquals("SELECT ID, NAME" + //
+                            "\nFROM orders" + //
+                            "\nWHERE tenant = 123" + //
+                            "\n\tAND FID = ?", resultSql);
+    }
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.sql.SQLUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.wall.WallCheckResult;
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+public class TenantSelectTest2 extends TestCase {
+
+    private String     sql    = "SELECT ID, NAME FROM orders WHERE FID = ? OR FID = ?";
+
+    private WallConfig config = new WallConfig();
+
+    protected void setUp() throws Exception {
+        config.setTenantTablePattern("*");
+        config.setTenantColumn("tenant");
+    }
+
+    public void testMySql() throws Exception {
+        WallProvider.setTenantValue(123);
+        MySqlWallProvider provider = new MySqlWallProvider(config);
+        WallCheckResult checkResult = provider.check(sql);
+        Assert.assertEquals(0, checkResult.getViolations().size());
+
+        String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL);
+        Assert.assertEquals("SELECT ID, NAME" + //
+                            "\nFROM orders" + //
+                            "\nWHERE tenant = 123" + //
+                            "\n\tAND (FID = ?" +
+                            "\n\t\t\tOR FID = ?)", resultSql);
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * 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.sql.SQLUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.wall.WallCheckResult;
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+public class TenantSelectTest3 extends TestCase {
+
+    private String     sql    = "SELECT ID, NAME " + //
+                                "FROM orders o inner join users u ON o.userid = u.id " + //
+                                "WHERE FID = ? OR FID = ?";
+
+    private WallConfig config = new WallConfig();
+
+    protected void setUp() throws Exception {
+        config.setTenantTablePattern("*");
+        config.setTenantColumn("tenant");
+    }
+
+    public void testMySql() throws Exception {
+        WallProvider.setTenantValue(123);
+        MySqlWallProvider provider = new MySqlWallProvider(config);
+        WallCheckResult checkResult = provider.check(sql);
+        Assert.assertEquals(0, checkResult.getViolations().size());
+
+        String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL);
+        Assert.assertEquals("SELECT ID, NAME" + //
+                            "\nFROM orders o" + //
+                            "\n\tINNER JOIN users u ON u.tenant = 123" + //
+                            "\n\t\tAND o.userid = u.id" + //
+                            "\nWHERE o.tenant = 123" + //
+                            "\n\tAND (FID = ?" + //
+                            "\n\t\t\tOR FID = ?)", resultSql);
+    }
+}

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

@@ -47,7 +47,7 @@ public class TenantUpdateTest extends TestCase {
 				JdbcConstants.MYSQL);
 		Assert.assertEquals("UPDATE T_USER" + //
 				"\nSET FNAME = ?" + //
-				"\nWHERE T_USER.tenant = 123" + //
+				"\nWHERE tenant = 123" + //
 				"\n\tAND FID = ?", resultSql);
 	}
 }