mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -30,11 +30,7 @@ import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.reflection.Reflector;
 import org.apache.ibatis.session.Configuration;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
@@ -272,6 +268,26 @@ public class TableInfo implements Constants {
         return sqlSelect;
     }
 
+    /**
+     * 获取需要进行查询的 select sql 片段
+     *
+     * @param predicate 过滤条件
+     * @return sql 片段
+     */
+    public String chooseSelect(Predicate<TableFieldInfo> predicate, List<String> noSelectProperty) {
+        if (CollectionUtils.isEmpty(noSelectProperty)) {
+            return chooseSelect(predicate);
+        }
+        String fieldsSqlSelect = fieldList.stream().filter(predicate)
+            .filter(i -> !noSelectProperty.contains(i.getProperty()))
+            .map(TableFieldInfo::getSqlSelect).collect(joining(COMMA));
+        if (!havePK() || noSelectProperty.contains(keyProperty)) {
+            return fieldsSqlSelect;
+        } else {
+            return getKeySqlSelect() + COMMA + fieldsSqlSelect;
+        }
+    }
+
     /**
      * 获取 insert 时候主键 sql 脚本片段
      * <p>insert into table (字段) values (值)</p>

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtils.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -36,8 +37,8 @@ import java.util.regex.Pattern;
  * @since 2016-11-13
  */
 public abstract class SqlUtils implements Constants {
-
-    private static final Pattern pattern = Pattern.compile("\\{@((\\w+?)|(\\w+?:\\w+?)|(\\w+?:\\w+?:\\w+?))}");
+    private static final String tp = "[\\w-,]+?";
+    private static final Pattern pattern = Pattern.compile(String.format("\\{@((%s)|(%s:\\w+?)|(%s:\\w+?:\\w+?))}", tp, tp, tp));
 
     /**
      * 用%连接like
@@ -90,10 +91,17 @@ public abstract class SqlUtils implements Constants {
         return sql;
     }
 
+    @SuppressWarnings("all")
     public static String getSelectBody(String tableName, String alisa, String asAlisa, String escapeSymbol) {
+        int notSel = tableName.indexOf("-");
+        List<String> notSelColl = null;
+        if (notSel > 0) {
+            notSelColl = Arrays.asList(tableName.substring(notSel + 1).split(COMMA));
+            tableName = tableName.substring(0, notSel);
+        }
         TableInfo tableInfo = TableInfoHelper.getTableInfo(tableName);
         Assert.notNull(tableInfo, "can not find TableInfo Cache by \"%s\"", tableName);
-        String s = tableInfo.chooseSelect(TableFieldInfo::isSelect);
+        String s = tableInfo.chooseSelect(TableFieldInfo::isSelect, notSelColl);
         if (alisa == null) {
             return s;
         }
@@ -108,14 +116,17 @@ public abstract class SqlUtils implements Constants {
             final String sa = alisa.concat(DOT);
             if (asA) {
                 int as = body.indexOf(AS);
+                String column;
+                String property;
                 if (as < 0) {
-                    sb.append(sa).append(body).append(AS).append(escapeColumn(asAlisa.concat(DOT).concat(body), escapeSymbol));
+                    column = body;
+                    property = StringUtils.getTargetColumn(body);
                 } else {
-                    String column = body.substring(0, as);
-                    String property = body.substring(as + 4);
+                    column = body.substring(0, as);
+                    property = body.substring(as + 4);
                     property = StringUtils.getTargetColumn(property);
-                    sb.append(sa).append(column).append(AS).append(escapeColumn(asAlisa.concat(DOT).concat(property), escapeSymbol));
                 }
+                sb.append(sa).append(column).append(AS).append(escapeColumn(asAlisa.concat(DOT).concat(property), escapeSymbol));
             } else {
                 sb.append(sa).append(body);
             }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtilsTest.java

@@ -14,8 +14,9 @@ class SqlUtilsTest {
 
     @Test
     void m1() {
-        List<String> list = SqlUtils.findPlaceholder("select {@table},{@table:t},{@table:t:r} from table");
-        assertThat(list).contains("{@table}", "{@table:t}", "{@table:t:r}");
+        List<String> list = SqlUtils.findPlaceholder("select {@table},{@table-id,name},{@table:t},{@table-id,name:t}," +
+            "{@table:t:r},{@table-id,name:t:r}, from table");
+        assertThat(list).contains("{@table}", "{@table-id,name}", "{@table:t}", "{@table-id,name:t}", "{@table:t:r}", "{@table-id,name:t:r}");
     }
 
     @Test

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/replaceplaceholder/Entity.java

@@ -1,5 +1,6 @@
 package com.baomidou.mybatisplus.test.replaceplaceholder;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -14,5 +15,17 @@ public class Entity implements Serializable {
 
     private Long id;
 
+    @TableField("`name`")
     private String name;
+
+    private Integer age;
+
+    @TableField(exist = false)
+    private EntitySub es;
+
+    @Data
+    public static class EntitySub {
+        private Long id;
+        private String name;
+    }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/replaceplaceholder/EntityMapper.java

@@ -11,9 +11,9 @@ import java.util.List;
  */
 public interface EntityMapper extends BaseMapper<Entity> {
 
-    @Select("select {@entity} from entity")
+    @Select("select {@entity-name,id} from entity")
     List<Entity> selectAll();
 
-    @Select("select {@entity:e} from entity e")
+    @Select("select {@entity:e},{@entity_sub-id:es:es} from entity e left join entity_sub es on e.id = es.id")
     List<Entity> selectAll2();
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/replaceplaceholder/EntitySubMapper.java

@@ -0,0 +1,10 @@
+package com.baomidou.mybatisplus.test.replaceplaceholder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author miemie
+ * @since 2020-06-23
+ */
+public interface EntitySubMapper extends BaseMapper<Entity.EntitySub> {
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/replaceplaceholder/ReplacePlaceholderTest.java

@@ -10,6 +10,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author miemie
  * @since 2020-06-23
@@ -19,15 +21,22 @@ public class ReplacePlaceholderTest extends BaseDbTest<EntityMapper> {
     @Test
     void replace() {
         doTest(i -> {
-            i.selectAll();
-            i.selectAll2();
+            List<Entity> list = i.selectAll();
+            System.out.println(list);
+            assertThat(list.getFirst().getId()).isNull();
+            assertThat(list.getFirst().getName()).isNull();
+            assertThat(list.getFirst().getAge()).isNotNull();
+            list = i.selectAll2();
+            System.out.println(list);
+            assertThat(list.getFirst().getEs().getId()).isNull();
+            assertThat(list.getFirst().getEs().getName()).isNotBlank();
         });
     }
 
     @Override
     protected List<Interceptor> interceptors() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new ReplacePlaceholderInnerInterceptor());
+        interceptor.addInnerInterceptor(new ReplacePlaceholderInnerInterceptor("\""));
         return Collections.singletonList(interceptor);
     }
 
@@ -41,14 +50,26 @@ public class ReplacePlaceholderTest extends BaseDbTest<EntityMapper> {
 
     @Override
     protected String tableDataSql() {
-        return "insert into entity(id,name) values(1,'1'),(2,'2');";
+        return "insert into entity(id,name,age) values(1,'1',1),(2,'2',2);" +
+            "insert into entity_sub(id,name) values(1,'1'),(2,'2');";
     }
 
     @Override
     protected List<String> tableSql() {
-        return Arrays.asList("drop table if exists entity", "CREATE TABLE IF NOT EXISTS entity (" +
-            "id BIGINT NOT NULL," +
-            "name VARCHAR(30) NULL DEFAULT NULL," +
-            "PRIMARY KEY (id))");
+        return Arrays.asList("drop table if exists entity", "drop table if exists entity_sub",
+            "CREATE TABLE IF NOT EXISTS entity (" +
+                "id BIGINT NOT NULL," +
+                "name VARCHAR(30) NULL DEFAULT NULL," +
+                "age int NULL DEFAULT NULL," +
+                "PRIMARY KEY (id))",
+            "CREATE TABLE IF NOT EXISTS entity_sub (" +
+                "id BIGINT NOT NULL," +
+                "name VARCHAR(30) NULL DEFAULT NULL," +
+                "PRIMARY KEY (id))");
+    }
+
+    @Override
+    protected List<Class<?>> otherMapper() {
+        return List.of(EntitySubMapper.class);
     }
 }