Wrapper包装SQL添加处理多重嵌套的情况

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/MybatisAbstractSQL.java

@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -38,6 +39,8 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
     private static final String OR = " OR ";
     private static final String AND_NEW = ") \nAND (";
     private static final String OR_NEW = ") \nOR (";
+    private static final Pattern pattern = Pattern.compile("[(|)|\\s]+");
+
 
     /**
      * SQL条件
@@ -72,6 +75,20 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
         return getSelf();
     }
 
+    /**
+     * <p>
+     * 补充方法,一般认为填补mp一个条件中多重嵌套解决方案
+     * 注:参数请不要传入外界动态参数否则可能会产生sql注入的危险
+     * </p>
+     *
+     * @param supp 补充语句
+     * @return this
+     */
+    public T SUPP(String supp) {
+        sql().where.add(supp);
+        return getSelf();
+    }
+
     public T AND_NEW() {
         sql().lastList.add(AND_NEW);
         return getSelf();
@@ -199,7 +216,10 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
                             last = part;
                             continue;
                         } else {
-                            builder.append(conjunction);
+                            //not nest append conjunction
+                            if (!checkNest(part) && !checkNest(last)) {
+                                builder.append(conjunction);
+                            }
                         }
                     }
                     builder.append(part);
@@ -246,5 +266,15 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
         public String sql(Appendable appendable) {
             return buildSQL(new SafeAppendable(appendable));
         }
+
+        /**
+         * 检查是否嵌套
+         *
+         * @param args
+         * @return true 嵌套
+         */
+        private boolean checkNest(String args) {
+            return pattern.matcher(args).matches();
+        }
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrapper.java

@@ -586,7 +586,6 @@ public abstract class Wrapper<T> implements Serializable {
      * <p>
      * 使用AND连接并换行
      * </p>
-     * <p>
      *
      * @return this
      */
@@ -595,6 +594,76 @@ public abstract class Wrapper<T> implements Serializable {
         return this;
     }
 
+    /**
+     * <p>
+     * 左嵌套方法
+     * </p>
+     *
+     * @return this
+     */
+    public Wrapper<T> leftNest() {
+        leftNest(1);
+        return this;
+    }
+
+    /**
+     * <p>
+     * 右嵌套方法
+     * </p>
+     *
+     * @return this
+     */
+    public Wrapper<T> rightNest() {
+        rightNest(1);
+        return this;
+    }
+
+    /**
+     * <p>
+     * 左嵌套方法,一般认为填补mp一个条件中多重嵌套解决方案
+     * </p>
+     *
+     * @param num 嵌套数量
+     * @return this
+     */
+    public Wrapper<T> leftNest(int num) {
+        nest("(", num);
+        return this;
+    }
+
+    /**
+     * <p>
+     * 右嵌套方法,一般认为填补mp一个条件中多重嵌套解决方案
+     * </p>
+     *
+     * @param num 嵌套数量
+     * @return this
+     */
+    public Wrapper<T> rightNest(int num) {
+        nest(")", num);
+        return this;
+    }
+
+    /**
+     * <p>
+     * 嵌套方法,一般认为填补mp一个条件中多重嵌套解决方案
+     * </p>
+     *
+     * @param nest 嵌套字符串 "(" or ")"
+     * @param num  嵌套数量
+     * @return this
+     */
+    private Wrapper<T> nest(String nest, int num) {
+        if (num >= 1) {
+            StringBuilder builder = new StringBuilder(num);
+            for (int i = 0; i < num; i++) {
+                builder.append(nest);
+            }
+            sql.SUPP(builder.toString());
+        }
+        return this;
+    }
+
     /**
      * <p>
      * 使用OR连接并换行

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/EntityWrapperTest.java

@@ -52,7 +52,7 @@ public class EntityWrapperTest {
     public void test() {
         /*
          * 无条件测试
-         */
+		 */
         Assert.assertEquals("", ew.originalSql());
     }
 
@@ -60,7 +60,7 @@ public class EntityWrapperTest {
     public void test11() {
         /*
          * 实体带where ifneed
-         */
+		 */
         ew.setEntity(new User(1));
         ew.where("name={0}", "'123'");
         // 测试克隆
@@ -77,7 +77,7 @@ public class EntityWrapperTest {
     public void test12() {
         /*
          * 实体带where orderby
-         */
+		 */
         ew.setEntity(new User(1));
         ew.where("name={0}", "'123'").orderBy("id", false);
         String sqlSegment = ew.originalSql();
@@ -89,7 +89,7 @@ public class EntityWrapperTest {
     public void test13() {
         /*
          * 实体排序
-         */
+		 */
         ew.setEntity(new User(1));
         ew.orderBy("id", false);
         String sqlSegment = ew.originalSql();
@@ -101,7 +101,7 @@ public class EntityWrapperTest {
     public void test21() {
         /*
          * 无实体 where ifneed orderby
-         */
+		 */
         ew.where("name={0}", "'123'").addFilterIfNeed(false, "id=1").orderBy("id");
         String sqlSegment = ew.originalSql();
         System.err.println("test21 = " + sqlSegment);
@@ -120,7 +120,7 @@ public class EntityWrapperTest {
     public void test23() {
         /*
          * 无实体查询，只排序
-         */
+		 */
         ew.orderBy("id", false);
         String sqlSegment = ew.originalSql();
         System.err.println("test23 = " + sqlSegment);
@@ -131,7 +131,7 @@ public class EntityWrapperTest {
     public void testNoTSQL() {
         /*
          * 实体 filter orderby
-         */
+		 */
         ew.setEntity(new User(1));
         ew.addFilter("name={0}", "'123'").orderBy("id,name");
         String sqlSegment = ew.originalSql();
@@ -143,7 +143,7 @@ public class EntityWrapperTest {
     public void testNoTSQL1() {
         /*
          * 非 T-SQL 无实体查询
-         */
+		 */
         ew.addFilter("name={0}", "'123'").addFilterIfNeed(false, "status=?", "1");
         String sqlSegment = ew.originalSql();
         System.err.println("testNoTSQL1 = " + sqlSegment);
@@ -154,7 +154,7 @@ public class EntityWrapperTest {
     public void testTSQL11() {
         /*
          * 实体带查询使用方法 输出看结果
-         */
+		 */
         ew.setEntity(new User(1));
         ew.where("name=?", "'zhangsan'").and("id=1").orNew("status=?", "0").or("status=1").notLike("nlike", "notvalue")
             .andNew("new=xx").like("hhh", "ddd").andNew("pwd=11").isNotNull("n1,n2").isNull("n3").groupBy("x1")
@@ -333,7 +333,7 @@ public class EntityWrapperTest {
     public void testIsWhere() {
         /*
          * 实体带where ifneed
-         */
+		 */
         ew.setEntity(new User(1));
         ew.setParamAlias("ceshi");
         ew.or("sql = {0}", "sql").like("default", "default", SqlLike.DEFAULT).like("left", "left", SqlLike.LEFT);
@@ -421,21 +421,39 @@ public class EntityWrapperTest {
     @Test
     public void testConditionOrderBys() {
         //空集合测试
-        //TODO: 3.0
-//        List<String> orders = null;
-//        Wrapper wrapper = Condition.create();
-//        wrapper.orderAsc(orders);
-//        Assert.assertNull(wrapper.getSqlSegment());
-//        orders = new ArrayList<>(3);
-//        wrapper.orderAsc(orders);
-//        Assert.assertNull(wrapper.getSqlSegment());
-//        orders.add("id1");
-//        orders.add("id2");
-//        orders.add("id3");
-//        wrapper.orderAsc(orders);
-//        Assert.assertEquals("ORDER BY id1 ASC, id2 ASC, id3 ASC", wrapper.getSqlSegment());
-//        wrapper.orderDesc(orders);
-//        Assert.assertEquals("ORDER BY id1 ASC, id2 ASC, id3 ASC, id1 DESC, id2 DESC, id3 DESC", wrapper.getSqlSegment());
+        List<String> orders = null;
+        EntityWrapper wrapper = new EntityWrapper();
+        wrapper.orderAsc(orders);
+        Assert.assertNull(wrapper.getSqlSegment());
+        orders = new ArrayList<>(3);
+        wrapper.orderAsc(orders);
+        Assert.assertNull(wrapper.getSqlSegment());
+        orders.add("id1");
+        orders.add("id2");
+        orders.add("id3");
+        wrapper.orderAsc(orders);
+        Assert.assertEquals("ORDER BY id1 ASC, id2 ASC, id3 ASC", wrapper.getSqlSegment());
+        wrapper.orderDesc(orders);
+        Assert.assertEquals("ORDER BY id1 ASC, id2 ASC, id3 ASC, id1 DESC, id2 DESC, id3 DESC", wrapper.getSqlSegment());
+    }
+
+    @Test
+    public void testNest1() {
+        EntityWrapper entityWrapper = new EntityWrapper();
+        String sqlSegment = entityWrapper.eq("aaa", "aaa").andNew().leftNest().eq("a", "a").orNew().eq("b", "b").eq("c", "c").rightNest().originalSql();
+        Assert.assertEquals(sqlSegment, "AND (aaa = ?) \n" +
+            "AND ((a = ?) \n" +
+            "OR (b = ? AND c = ?))");
+    }
+
+    @Test
+    public void testNest2() {
+        EntityWrapper entityWrapper = new EntityWrapper();
+        String sqlSegment = entityWrapper.eq("aaa", "aaa").andNew().leftNest(2).eq("a", "a").orNew().eq("b", "b").eq("c", "c").rightNest().orNew().eq("d", "d").eq("e", "e").rightNest().originalSql();
+        Assert.assertEquals(sqlSegment, "AND (aaa = ?) \n" +
+            "AND (((a = ?) \n" +
+            "OR (b = ? AND c = ?)) \n" +
+            "OR (d = ? AND e = ?))");
     }
 
 }