调试测试用例，修改更新日志

CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## [v3.0-RC2] 2018.08.10 代号：超级棒棒糖 🍭 RC2
+- 生成器加回 MODULE_NAME 开放配置 config
+- 修复setting - defaultEnumTypeHandler属性配置无效
+- 兼容 Spring boot 1.x 启动.
+- 日常优化 , 测试用例 , 优化抛出异常的过程
+- 新增 Gitee Github issue,pull_request模板
+- 移除数据库关键字转义, 只支持注解模式转义
+- 优化掉抛异常为使用 assert 或者 exceptionUtils
+- 设置下划线转驼峰到 configuration 优化 ColumnUnderline
+- 解决 page 序列化 asc desc 多态序列化异常
+- 默认的 dbType 改为 other, 如果用户没有配置才会自动获取 dbType
+- 优化,ColumnUnderline与MapUnderscoreToCamelCase意义相同
+- fixed ILY8C 生成器指定 IdType 场景导入包
+- 补充注释新增大量测试用例
+
 
 ## [v3.0-RC1] 2018.08.01 代号：超级棒棒糖 🍭 RC1
 - 优化工具类部分代码，并修复一个在多线程环境下可能会引发死锁的BUG

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

@@ -56,7 +56,7 @@ public class MybatisConfiguration extends Configuration {
         System.out.println("| |  | || |_| || |_/ /| (_| || |_ | |\\__ \\  | |    | || |_| |\\__ \\");
         System.out.println("\\_|  |_/ \\__, |\\____/  \\__,_| \\__||_||___/  \\_|    |_| \\__,_||___/");
         System.out.println("          __/ |                                                   ");
-        System.out.println("         |___/                                             3.0-RC1");
+        System.out.println("         |___/                                              3.0-RC2");
         System.out.println();
     }
 

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

@@ -15,19 +15,20 @@
  */
 package com.baomidou.mybatisplus.core.test;
 
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
-import org.junit.Test;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class WrapperTest {
 
@@ -47,10 +48,14 @@ public class WrapperTest {
 
     @Test
     public void test() {
-        Wrapper<User> wrapper = new QueryWrapper<User>().lambda().eq(User::getName, 123)
-            .or(c -> c.eq(User::getRoleId, 1).eq(User::getId, 2))
-            .eq(User::getId, 1);
-        log(wrapper.getSqlSegment());
+        try {
+            Wrapper<User> wrapper = new QueryWrapper<User>().lambda().eq(User::getName, 123)
+                .or(c -> c.eq(User::getRoleId, 1).eq(User::getId, 2))
+                .eq(User::getId, 1);
+            log(wrapper.getSqlSegment());
+        } catch (Exception e) {
+            log(e.getMessage());
+        }
 
     }
 
@@ -176,8 +181,8 @@ public class WrapperTest {
     public void testPluralLambda() {
         TableInfoHelper.initTableInfo(null, User.class);
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(User::getName,"sss");
-        queryWrapper.lambda().eq(User::getName,"sss2");
+        queryWrapper.lambda().eq(User::getName, "sss");
+        queryWrapper.lambda().eq(User::getName, "sss2");
         logSqlSegment("测试 PluralLambda", queryWrapper);
         logParams(queryWrapper);
     }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
@@ -45,6 +46,7 @@ public class PostgreSQLGenerator extends GeneratorTest {
         //gc.setKotlin(true); // 是否生成 kotlin 代码
         //gc.setSwagger2(true); // 是否生成 Swagger2 注解
         gc.setAuthor("hubin");
+        gc.setIdType(IdType.AUTO);
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         // gc.setEntityName("%sEntity");

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

@@ -7,7 +7,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -16,6 +15,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.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
@@ -68,7 +68,7 @@ public class H2UserTest extends BaseTest {
     @Test
     public void testEntityWrapperSelectSql() {
         QueryWrapper<H2User> ew = new QueryWrapper<>();
-        ew.select("test_id as id, name, age");
+        ew.select("test_id as testId, name, age");
         List<H2User> list = userService.list(ew);
         for (H2User u : list) {
             Assert.assertNotNull(u.getTestId());
@@ -120,7 +120,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
-    public void testUpdateByIdWithOptLock(){
+    public void testUpdateByIdWithOptLock() {
         Long id = 991L;
         H2User user = new H2User();
         user.setTestId(id);
@@ -137,7 +137,7 @@ public class H2UserTest extends BaseTest {
 
         userDB.setName("992");
         userService.updateById(userDB);
-        Assert.assertEquals("updated version value should be updated to entity",2, userDB.getVersion().intValue());
+        Assert.assertEquals("updated version value should be updated to entity", 2, userDB.getVersion().intValue());
 
         userDB = userService.getById(id);
         Assert.assertEquals(2, userDB.getVersion().intValue());
@@ -145,15 +145,15 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
-    public void testUpdateByEwWithOptLock(){
+    public void testUpdateByEwWithOptLock() {
         QueryWrapper<H2User> ew = new QueryWrapper<>();
-        ew.gt("age",13);
-        for(H2User u: userService.list(ew)){
-            System.out.println(u.getName()+","+u.getAge()+","+u.getVersion());
+        ew.gt("age", 13);
+        for (H2User u : userService.list(ew)) {
+            System.out.println(u.getName() + "," + u.getAge() + "," + u.getVersion());
         }
         userService.update(new H2User().setPrice(BigDecimal.TEN), ew);
-        for(H2User u: userService.list(ew)){
-            System.out.println(u.getName()+","+u.getAge()+","+u.getVersion());
+        for (H2User u : userService.list(ew)) {
+            System.out.println(u.getName() + "," + u.getAge() + "," + u.getVersion());
         }
     }
 
@@ -167,7 +167,7 @@ public class H2UserTest extends BaseTest {
             Assert.assertNotNull(u.getName());
             Assert.assertNull(u.getPrice());
         }
-        ew = new QueryWrapper<>(null,"test_id","name","age","price");
+        ew = new QueryWrapper<>(null, "test_id", "name", "age", "price");
         ew.excludeColumns(H2User.class, "age", "price", null);
         list = userService.list(ew);
         for (H2User u : list) {
@@ -182,21 +182,21 @@ public class H2UserTest extends BaseTest {
             Assert.assertNotNull(u.getName());
             Assert.assertNull(u.getPrice());
         }
-        Wrapper<H2User> wrapper = new QueryWrapper<H2User>().lambda().select().excludeColumns(H2User.class,H2User::getAge,H2User::getPrice);
-        List<H2User> list2  = userService.list(wrapper);
+        Wrapper<H2User> wrapper = new QueryWrapper<H2User>().lambda().select().excludeColumns(H2User.class, H2User::getAge, H2User::getPrice);
+        List<H2User> list2 = userService.list(wrapper);
         for (H2User u : list2) {
             Assert.assertNotNull(u.getTestId());
             Assert.assertNotNull(u.getName());
             Assert.assertNull(u.getPrice());
         }
-        wrapper = new QueryWrapper<>(new H2User()).lambda().select().excludeColumns(H2User::getAge,H2User::getPrice);
-        list2  = userService.list(wrapper);
+        wrapper = new QueryWrapper<>(new H2User()).lambda().select().excludeColumns(H2User::getAge, H2User::getPrice);
+        list2 = userService.list(wrapper);
         for (H2User u : list2) {
             Assert.assertNotNull(u.getTestId());
             Assert.assertNotNull(u.getName());
             Assert.assertNull(u.getPrice());
         }
-        wrapper = new QueryWrapper<H2User>().lambda().select(H2User::getTestId,H2User::getName,H2User::getTestDate,H2User::getPrice,H2User::getAge).excludeColumns(H2User.class,H2User::getAge,H2User::getTestDate,H2User::getVersion,H2User::getPrice);
+        wrapper = new QueryWrapper<H2User>().lambda().select(H2User::getTestId, H2User::getName, H2User::getTestDate, H2User::getPrice, H2User::getAge).excludeColumns(H2User.class, H2User::getAge, H2User::getTestDate, H2User::getVersion, H2User::getPrice);
         list2 = userService.list(wrapper);
         for (H2User u : list2) {
             Assert.assertNotNull(u.getName());

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(
-        "query a.addr_id as addrId, a.addr_name as addrName from h2address a" +
+        "select 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(
-        "query a.addr_id as addrId, a.addr_name as addrName from h2address a" +
+        "select 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, IPage<H2Addr> page);
@@ -56,29 +56,29 @@ public interface H2UserMapper extends SuperMapper<H2User> {
     int myInsertWithoutParam(H2User user1);
 
 
-    @Select(" query test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
+    @Select(" select 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(" query test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
+//    @Select(" select 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(" query test_id as id, power(${ageFrom},2) as age, '${nameParam}' as name " +
+//    @Select(" select 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("query count(1) from (" +
-        "query test_id as id, CAST(#{nameParam} AS VARCHAR) as name" +
+    @Select("select count(1) from (" +
+        "select 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("query * from h2user")
+    @Select("select * from h2user")
     List<Map> mySelectMaps();
 }