Merge remote-tracking branch 'origin/dev' into dev

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -23,6 +23,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.baomidou.mybatisplus.entity.Column;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
@@ -420,11 +421,11 @@ public class H2UserTest extends H2Test {
 
 
     @Test
-    public void testEntityWrapperSelectSql(){
+    public void testEntityWrapperSelectSql() {
         EntityWrapper<H2User> ew = new EntityWrapper<>();
         ew.setSqlSelect("test_id as id, name, age");
         List<H2User> list = userService.selectList(ew);
-        for(H2User u:list){
+        for (H2User u : list) {
             Assert.assertNotNull(u.getId());
             Assert.assertNotNull(u.getName());
             Assert.assertNull(u.getPrice());
@@ -433,29 +434,30 @@ public class H2UserTest extends H2Test {
     }
 
     @Test
-    public void testQueryWithParamInSelectStatement(){
-        Map<String,Object> param = new HashMap<>();
+    public void testQueryWithParamInSelectStatement() {
+        Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
         param.put("ageTo", 100);
         List<H2User> list = userService.queryWithParamInSelectStatememt(param);
         Assert.assertNotNull(list);
-        for(H2User u:list){
+        for (H2User u : list) {
             Assert.assertEquals(nameParam, u.getName());
             Assert.assertNotNull(u.getId());
         }
     }
+
     @Test
-    public void testQueryWithParamInSelectStatement4Page(){
-        Map<String,Object> param = new HashMap<>();
+    public void testQueryWithParamInSelectStatement4Page() {
+        Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
         param.put("ageTo", 100);
-        Page<H2User> page = userService.queryWithParamInSelectStatememt4Page(param, new Page<H2User>(0,10));
+        Page<H2User> page = userService.queryWithParamInSelectStatememt4Page(param, new Page<H2User>(0, 10));
         Assert.assertNotNull(page.getRecords());
-        for(H2User u:page.getRecords()){
+        for (H2User u : page.getRecords()) {
             Assert.assertEquals(nameParam, u.getName());
             Assert.assertNotNull(u.getId());
         }
@@ -463,8 +465,8 @@ public class H2UserTest extends H2Test {
     }
 
     @Test
-    public void testSelectCountWithParamInSelectItems(){
-        Map<String,Object> param = new HashMap<>();
+    public void testSelectCountWithParamInSelectItems() {
+        Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
@@ -474,16 +476,32 @@ public class H2UserTest extends H2Test {
     }
 
     @Test
-    public void testPageWithDollarParamInSelectItems(){
-        Map<String,Object> param = new HashMap<>();
+    public void testPageWithDollarParamInSelectItems() {
+        Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
         param.put("ageTo", 100);
-        Page<H2User> page = new Page<H2User>(0,10);
+        Page<H2User> page = new Page<H2User>(0, 10);
         userMapper.selectUserWithDollarParamInSelectStatememt4Page(param, page);
         Assert.assertNotEquals(0, page.getTotal());
 
     }
 
+    @Test
+    public void testDistinctColumn() {
+        EntityWrapper<H2User> ew = new EntityWrapper<>();
+        ew.setSqlSelect(Column.create().column("distinct test_type"));//setMapUnderscoreToCamelCase(true)
+        List<H2User> list = userService.selectList(ew);
+        for (H2User u : list) {
+            System.out.println("getTestType=" + u.getTestType());
+            Assert.assertNotNull(u.getTestType());
+        }
+        ew.setSqlSelect("distinct test_type as testType");
+        for (H2User u : userService.selectList(ew)) {
+            System.out.println("testType=" + u.getTestType());
+            Assert.assertNotNull(u.getTestType());
+        }
+    }
+
 }

src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java

@@ -41,6 +41,7 @@ public class MybatisPlusConfig {
 //        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
 //        org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
         configuration.setJdbcTypeForNull(JdbcType.NULL);
+        configuration.setMapUnderscoreToCamelCase(true);
         sqlSessionFactory.setConfiguration(configuration);
         PaginationInterceptor pagination = new PaginationInterceptor();
         OptimisticLockerInterceptor optLock = new OptimisticLockerInterceptor();

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -37,7 +37,7 @@ import lombok.experimental.Accessors;
 /* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
 @Data
 @Accessors(chain = true)
-@TableName
+@TableName("h2user")
 public class H2User extends SuperEntity {
 
     /* 测试忽略验证 */

src/test/resources/h2/user.insert.sql

@@ -1,5 +1,5 @@
 insert into h2user(test_id, name, test_date, age, price, test_type, version) values (101,'Tomcat', '2017-1-1 1:1:1', 3, 9.99, 1, 1),
-insert into h2user(test_id, name, test_date, age, price, test_type, version) values (102,'Jerry', '2017-3-1 1:1:1', 2, 19.99, 1, 2);
-insert into h2user(test_id, name, test_date, age, price, test_type, version) values (103,'Bob', '2017-4-1 1:1:1', 13, 99.99, 1, 3);
+insert into h2user(test_id, name, test_date, age, price, test_type, version) values (102,'Jerry', '2017-3-1 1:1:1', 2, 19.99, 2, 2);
+insert into h2user(test_id, name, test_date, age, price, test_type, version) values (103,'Bob', '2017-4-1 1:1:1', 13, 99.99, 3, 3);
 insert into h2user(test_id, name, test_date, age, price, test_type, version) values (104,'Joe', '2017-2-1 1:1:1', 18, 1.99, 1, 4);
 insert into h2user(test_id, name, test_date, age, price, test_type, version) values (105,'Tony', '2017-2-1 1:1:1', 18, 1.99, 1, 5);