3x 进化一波类方法名修改

mybatis-plus-adapter/src/main/java/com/baomidou/mybatisplus/mapper/Wrapper.java

@@ -804,7 +804,7 @@ public class Wrapper<T> extends com.baomidou.mybatisplus.core.conditions.Wrapper
      * @param condition 拼接的前置条件
      * @param sqlHaving having关键字后面跟随的语句
      * @param params    参数集
-     * @return EntityWrapper<T>
+     * @return QueryWrapper<T>
      */
     public Wrapper<T> having(boolean condition, String sqlHaving, Object... params) {
         if (condition) {
@@ -823,7 +823,7 @@ public class Wrapper<T> extends com.baomidou.mybatisplus.core.conditions.Wrapper
      *
      * @param sqlHaving having关键字后面跟随的语句
      * @param params    参数集
-     * @return EntityWrapper<T>
+     * @return QueryWrapper<T>
      */
     public Wrapper<T> having(String sqlHaving, Object... params) {
         return having(true, sqlHaving, params);
@@ -1521,7 +1521,7 @@ public class Wrapper<T> extends com.baomidou.mybatisplus.core.conditions.Wrapper
      * <p>
      * 根据需要格式化SQL<BR>
      * <BR>
-     * Format SQL for methods: EntityWrapper<T>.where/and/or...("name={0}", value);
+     * Format SQL for methods: QueryWrapper<T>.where/and/or...("name={0}", value);
      * ALL the {<b>i</b>} will be replaced with #{MPGENVAL<b>i</b>}<BR>
      * <BR>
      * ew.where("sample_name=<b>{0}</b>", "haha").and("sample_age &gt;<b>{0}</b>

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

@@ -113,7 +113,7 @@ public interface Join<This> extends Serializable {
 
     /**
      * EXISTS ( sql 语句 )
-     * 例: exists("select id from table where age = 1")
+     * 例: exists("query id from table where age = 1")
      */
     default This exists(String existsSql) {
         return exists(true, existsSql);
@@ -126,7 +126,7 @@ public interface Join<This> extends Serializable {
 
     /**
      * NOT EXISTS ( sql 语句 )
-     * 例: notExists("select id from table where age = 1")
+     * 例: notExists("query id from table where age = 1")
      */
     default This notExists(String notExistsSql) {
         return notExists(true, notExistsSql);

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2011-2020, hubin (jobob@qq.com).
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.baomidou.mybatisplus.core.conditions.query;
+
+import static java.util.stream.Collectors.joining;
+
+import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
+import com.baomidou.mybatisplus.core.toolkit.support.Property;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * <p>
+ * Lambda 语法使用 Wrapper
+ * </p>
+ *
+ * @author hubin miemie HCL
+ * @since 2017-05-26
+ */
+public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryWrapper<T>> implements Serializable {
+
+    /**
+     * SQL 查询字段内容，例如：id,name,age
+     */
+    private List<String> sqlSelect = new ArrayList<>();
+
+    LambdaQueryWrapper(T entity, AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs) {
+        this.entity = entity;
+        this.paramNameSeq = paramNameSeq;
+        this.paramNameValuePairs = paramNameValuePairs;
+    }
+
+    @Override
+    public String getSqlSelect() {
+        if (CollectionUtils.isEmpty(sqlSelect)) {
+            return null;
+        }
+        return SqlUtils.stripSqlInjection(sqlSelect.stream().collect(joining(",")));
+    }
+
+    /**
+     * <p>
+     * SELECT 部分 SQL 设置
+     * </p>
+     *
+     * @param columns 查询字段
+     * @return
+     */
+    public LambdaQueryWrapper<T> select(Property<T, ?>... columns) {
+        for (Property<T, ?> column : columns) {
+            sqlSelect.add(this.columnToString(column));
+        }
+        return typedThis;
+    }
+
+
+    @Override
+    protected LambdaQueryWrapper<T> instance(AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs) {
+        return new LambdaQueryWrapper<>(entity, paramNameSeq, paramNameValuePairs);
+    }
+}

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

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2011-2020, hubin (jobob@qq.com).
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.baomidou.mybatisplus.core.conditions.query;
+
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
+
+import java.io.Serializable;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * <p>
+ * Entity 对象封装操作类
+ * </p>
+ *
+ * @author hubin miemie HCL
+ * @Date 2018-05-25
+ */
+public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>> implements Serializable {
+
+    /**
+     * SQL 查询字段内容，例如：id,name,age
+     */
+    private String sqlSelect;
+
+    public QueryWrapper() {
+        this(null, null);
+    }
+
+    public QueryWrapper(T entity) {
+        this(entity, null);
+    }
+
+    public QueryWrapper(T entity, String sqlSelect) {
+        this.sqlSelect = sqlSelect;
+        this.entity = entity;
+        this.initNeed();
+    }
+
+    private QueryWrapper(T entity, String sqlSelect, AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs) {
+        this.entity = entity;
+        this.sqlSelect = sqlSelect;
+        this.paramNameSeq = paramNameSeq;
+        this.paramNameValuePairs = paramNameValuePairs;
+    }
+
+    @Override
+    public String getSqlSelect() {
+        return StringUtils.isEmpty(sqlSelect) ? null : SqlUtils.stripSqlInjection(sqlSelect);
+    }
+
+    public QueryWrapper<T> select(String sqlSelect) {
+        if (StringUtils.isNotEmpty(sqlSelect)) {
+            this.sqlSelect = sqlSelect;
+        }
+        return typedThis;
+    }
+
+    public LambdaQueryWrapper<T> lambda() {
+        return new LambdaQueryWrapper<>(entity, paramNameSeq, paramNameValuePairs);
+    }
+
+    @Override
+    protected String columnToString(String column) {
+        return column;
+    }
+
+    @Override
+    protected QueryWrapper<T> instance(AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs) {
+        return new QueryWrapper<>(entity, sqlSelect, paramNameSeq, paramNameValuePairs);
+    }
+}

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

@@ -57,7 +57,7 @@ public class UpdateWrapper<T> extends AbstractWrapper<T, String, UpdateWrapper<T
         this.paramNameValuePairs = paramNameValuePairs;
     }
 
-    public LambdaUpdateWrapper<T> stream() {
+    public LambdaUpdateWrapper<T> lambda() {
         return new LambdaUpdateWrapper<>(entity, paramNameSeq, paramNameValuePairs);
     }
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/pagination/Pagination.java

@@ -67,7 +67,7 @@ public class Pagination extends RowBounds implements Serializable {
     private boolean openSort = true;
 
     /**
-     * 优化 Count Sql 设置 false 执行 select count(1) from (listSql)
+     * 优化 Count Sql 设置 false 执行 query count(1) from (listSql)
      */
     private boolean optimizeCountSql = true;
 

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

@@ -68,7 +68,7 @@ public class SqlFormatter {
         DML.add("update");
         DML.add("delete");
 
-        MISC.add("select");
+        MISC.add("query");
         MISC.add("on");
     }
 
@@ -146,7 +146,7 @@ public class SqlFormatter {
                     beginNewClause();
                 } else if (END_CLAUSES.contains(lcToken)) {
                     endNewClause();
-                } else if ("select".equals(lcToken)) {
+                } else if ("query".equals(lcToken)) {
                     select();
                 } else if (DML.contains(lcToken)) {
                     updateOrInsertOrDelete();

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

@@ -16,7 +16,7 @@
 package com.baomidou.mybatisplus.core.toolkit.sql;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.pagination.Page;
@@ -192,7 +192,7 @@ public class SqlHelper {
         }
         // wrapper 不存创建一个 Condition
         if (isEmptyOfWrapper(wrapper)) {
-            wrapper = new EntityWrapper<>();
+            wrapper = new QueryWrapper<>();
         }
         // 排序 fixed gitee issues/IHF7N
 //        if (page.isOpenSort() && page.isSearchCount()) {

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/WrapperTest.java

@@ -1,7 +1,7 @@
 package com.baomidou.mybatisplus.core.test;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 import org.junit.Test;
@@ -14,7 +14,7 @@ public class WrapperTest {
 
     @Test
     public void test() {
-        Wrapper<User> wrapper = new EntityWrapper<User>().stream().eq(User::getName, 123)
+        Wrapper<User> wrapper = new QueryWrapper<User>().lambda().eq(User::getName, 123)
             .or(c -> c.eq(User::getRoleId, 1).eq(User::getId, 2))
             .and().eq(User::getId, 1);
         log(wrapper.getSqlSegment());
@@ -23,7 +23,7 @@ public class WrapperTest {
 
     @Test
     public void test1() {
-        EntityWrapper<User> ew = new EntityWrapper<User>()
+        QueryWrapper<User> ew = new QueryWrapper<User>()
             .eq("xxx", 123)
             .and(i -> i.eq("andx", 65444).and().le("ande", 66666))
             .and().ne("xxx", 222);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/incrementer/H2KeyGenerator.java

@@ -15,7 +15,7 @@ public class H2KeyGenerator implements IKeyGenerator {
     @Override
     public String executeSql(String incrementerName) {
         StringBuilder sql = new StringBuilder();
-        sql.append("select ");
+        sql.append("query ");
         sql.append(incrementerName);
         sql.append(".nextval");
         return sql.toString();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/incrementer/PostgreKeyGenerator.java

@@ -15,7 +15,7 @@ public class PostgreKeyGenerator implements IKeyGenerator {
     @Override
     public String executeSql(String incrementerName) {
         StringBuilder sql = new StringBuilder();
-        sql.append("select nextval('");
+        sql.append("query nextval('");
         sql.append(incrementerName);
         sql.append("')");
         return sql.toString();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/OptimisticLockerInterceptor.java

@@ -76,7 +76,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
             MapperMethod.ParamMap map = (MapperMethod.ParamMap) param;
             Wrapper ew = null;
             if (map.containsKey(NAME_ENTITY_WRAPPER)) {
-                // mapper.update(updEntity, EntityWrapper<>(whereEntity);
+                // mapper.update(updEntity, QueryWrapper<>(whereEntity);
                 ew = (Wrapper) map.get(NAME_ENTITY_WRAPPER);
             }
             //else updateById(entity) -->> change updateById(entity) to updateById(@Param("et") entity)

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/DB2Dialect.java

@@ -40,14 +40,14 @@ public class DB2Dialect implements IDialect {
     }
 
     private static boolean hasDistinct(String originalSql) {
-        return originalSql.toLowerCase().contains("select distinct");
+        return originalSql.toLowerCase().contains("query distinct");
     }
 
     @Override
     public String buildPaginationSql(String originalSql, int offset, int limit) {
-        int startOfSelect = originalSql.toLowerCase().indexOf("select");
+        int startOfSelect = originalSql.toLowerCase().indexOf("query");
         StringBuilder pagingSelect = new StringBuilder(originalSql.length() + 100)
-            .append(originalSql.substring(0, startOfSelect)).append("select * from ( select ")
+            .append(originalSql.substring(0, startOfSelect)).append("query * from ( query ")
             .append(getRowNumber(originalSql));
         if (hasDistinct(originalSql)) {
             pagingSelect.append(" row_.* from ( ").append(originalSql.substring(startOfSelect)).append(" ) as row_");
@@ -56,7 +56,7 @@ public class DB2Dialect implements IDialect {
         }
         pagingSelect.append(" ) as temp_ where rownumber_ ");
 
-        // add the restriction to the outer select
+        // add the restriction to the outer query
         if (offset > 0) {
             String endString = offset + "+" + limit;
             pagingSelect.append("between ").append(offset).append("+1 and ").append(endString);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/SQLServer2005Dialect.java

@@ -48,9 +48,9 @@ public class SQLServer2005Dialect implements IDialect {
 
         String loweredString = originalSql.toLowerCase();
         String sqlPartString = originalSql;
-        if (loweredString.trim().startsWith("select")) {
+        if (loweredString.trim().startsWith("query")) {
             int index = 6;
-            if (loweredString.startsWith("select distinct")) {
+            if (loweredString.startsWith("query distinct")) {
                 distinctStr = "DISTINCT ";
                 index = 15;
             }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParser.java

@@ -46,7 +46,7 @@ public class TenantSqlParser extends AbstractJsqlParser {
     private TenantHandler tenantHandler;
 
     /**
-     * select 语句处理
+     * query 语句处理
      */
     @Override
     public void processSelectBody(SelectBody selectBody) {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisMapperRefresh.java

@@ -254,7 +254,7 @@ public class MybatisMapperRefresh implements Runnable {
         for (XNode resultChild : xNode.getChildren()) {
             if ("association".equals(resultChild.getName()) || "collection".equals(resultChild.getName())
                 || "case".equals(resultChild.getName())) {
-                if (resultChild.getStringAttribute("select") == null) {
+                if (resultChild.getStringAttribute("query") == null) {
                     configuration.getResultMapNames().remove(
                         resultChild.getStringAttribute("id", resultChild.getValueBasedIdentifier()));
                     configuration.getResultMapNames().remove(

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java

@@ -115,7 +115,7 @@ public class SqlRunner implements ISqlRunner {
 
     /**
      * 根据sql查询Map结果集
-     * SqlRunner.db().selectList("select * from tbl_user where name={0}", "Caratacus")
+     * SqlRunner.db().selectList("query * from tbl_user where name={0}", "Caratacus")
      *
      * @param sql  sql语句，可添加参数，格式：{0},{1}
      * @param args 只接受String格式

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/SqlServerQuery.java

@@ -39,7 +39,7 @@ public class SqlServerQuery extends AbstractDbQuery {
 
     @Override
     public String tablesSql() {
-        return "select cast(so.name as varchar(500)) as TABLE_NAME, " +
+        return "query cast(so.name as varchar(500)) as TABLE_NAME, " +
             "cast(sep.value as varchar(500)) as COMMENTS from sysobjects so " +
             "left JOIN sys.extended_properties sep on sep.major_id=so.id and sep.minor_id=0 " +
             "where (xtype='U' or xtype='v')";
@@ -58,7 +58,7 @@ public class SqlServerQuery extends AbstractDbQuery {
             + " AND sysindexkeys.indid = sysindexes.indid "
             + " AND syscolumns.colid = sysindexkeys.colid AND syscolumns.NAME = B.NAME) as 'KEY',"
             + "  b.is_identity isIdentity "
-            + " FROM ( select name,object_id from sys.tables UNION all select name,object_id from sys.views ) a "
+            + " FROM ( query name,object_id from sys.tables UNION all query name,object_id from sys.views ) a "
             + " INNER JOIN sys.COLUMNS b ON b.object_id = a.object_id "
             + " LEFT JOIN sys.types ON b.user_type_id = sys.types.user_type_id   "
             + " LEFT JOIN sys.extended_properties c ON c.major_id = b.object_id AND c.minor_id = b.column_id "

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -17,7 +17,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
@@ -74,7 +74,7 @@ public class H2UserMapperTest extends BaseTest {
         Assert.assertTrue(1 == userMapper.deleteByMap(map));
 
         // 查询列表
-        Wrapper<H2User> wrapper = new EntityWrapper<H2User>().stream().like(H2User::getName, "mp");
+        Wrapper<H2User> wrapper = new QueryWrapper<H2User>().lambda().like(H2User::getName, "mp");
         log(wrapper.getSqlSegment());
 
         List<H2User> h2UserList = userMapper.selectList(wrapper);
@@ -91,11 +91,11 @@ public class H2UserMapperTest extends BaseTest {
         h2User = new H2User();
         h2User.setAge(2);
         Assert.assertTrue(1 == userMapper.update(h2User,
-            new EntityWrapper<H2User>().eq("name", NQQ)));
+            new QueryWrapper<H2User>().eq("name", NQQ)));
 
         h2User.setAge(3);
         Assert.assertTrue(1 == userMapper.update(h2User,
-            new EntityWrapper<H2User>().stream().eq(H2User::getName, NQQ)));
+            new QueryWrapper<H2User>().lambda().eq(H2User::getName, NQQ)));
 
         Assert.assertNotNull(userMapper.selectOne(new H2User().setName(NQQ)));
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
@@ -66,7 +66,7 @@ public class H2UserTest extends BaseTest {
 
     @Test
     public void testEntityWrapperSelectSql() {
-        EntityWrapper<H2User> ew = new EntityWrapper<>();
+        QueryWrapper<H2User> ew = new QueryWrapper<>();
         ew.select("test_id as id, name, age");
         List<H2User> list = userService.selectList(ew);
         for (H2User u : list) {

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java

@@ -23,13 +23,13 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 public interface H2UserMapper extends SuperMapper<H2User> {
 
     @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
+        "query a.addr_id as addrId, a.addr_name as addrName from h2address a" +
             " join h2user u on u.test_id=a.test_id and u.test_id=#{userId}"
     )
     List<H2Addr> getAddrListByUserId(@Param("userId") Long userId);
 
     @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
+        "query a.addr_id as addrId, a.addr_name as addrName from h2address a" +
             " join h2user u on u.test_id=a.test_id and u.test_id=#{userId}"
     )
     List<H2Addr> getAddrListByUserIdPage(@Param("userId") Long userId, Page<H2Addr> page);
@@ -56,29 +56,29 @@ public interface H2UserMapper extends SuperMapper<H2User> {
     int myInsertWithoutParam(H2User user1);
 
 
-    @Select(" select test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
+    @Select(" query test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
         " from h2user " +
         " where age>#{ageFrom} and age<#{ageTo} ")
     List<H2User> selectUserWithParamInSelectStatememt(Map<String, Object> param);
 
-    @Select(" select test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
+    @Select(" query test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
         " from h2user " +
         " where age>#{ageFrom} and age<#{ageTo} ")
     List<H2User> selectUserWithParamInSelectStatememt4Page(Map<String, Object> param, Page<H2User> page);
 
-    @Select(" select test_id as id, power(${ageFrom},2) as age, '${nameParam}' as name " +
+    @Select(" query test_id as id, power(${ageFrom},2) as age, '${nameParam}' as name " +
         " from h2user " +
         " where age>#{ageFrom} and age<#{ageTo} ")
     List<H2User> selectUserWithDollarParamInSelectStatememt4Page(Map<String, Object> param, Page<H2User> page);
 
 
-    @Select("select count(1) from (" +
-        "select test_id as id, CAST(#{nameParam} AS VARCHAR) as name" +
+    @Select("query count(1) from (" +
+        "query test_id as id, CAST(#{nameParam} AS VARCHAR) as name" +
         " from h2user " +
         " where age>#{ageFrom} and age<#{ageTo} " +
         ") a")
     int selectCountWithParamInSelectItems(Map<String, Object> param);
 
-    @Select("select * from h2user")
+    @Select("query * from h2user")
     List<Map> mySelectMaps();
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -1,6 +1,6 @@
 package com.baomidou.mybatisplus.test.mysql;
 
-import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.test.base.entity.TestData;
 import com.baomidou.mybatisplus.test.base.mapper.TestDataMapper;
 import com.baomidou.mybatisplus.test.h2.BaseTest;
@@ -34,7 +34,7 @@ public class MysqlTestDataMapperTest extends BaseTest {
 
     @Test
     public void commonSelectList() {
-        List<TestData> list = testDataMapper.selectList(new EntityWrapper<TestData>()
+        List<TestData> list = testDataMapper.selectList(new QueryWrapper<TestData>()
             .eq("id", 1L)
             .like("test_str", 1));
         list.forEach(System.out::println);
@@ -42,7 +42,7 @@ public class MysqlTestDataMapperTest extends BaseTest {
 
     @Test
     public void specialSelectList() {
-        testDataMapper.selectList(new EntityWrapper<TestData>().stream()
+        testDataMapper.selectList(new QueryWrapper<TestData>().lambda()
             .and());
     }
 }