浏览代码

测试用例迁移到 mybatis-plus 模块下

hubin 7 年之前
父节点
当前提交
f6c993ee44
共有 100 个文件被更改,包括 36 次插入8627 次删除
  1. 36 13
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Sequence.java
  2. 0 66
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/CrudTest.java
  3. 0 459
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/EntityWrapperTest.java
  4. 0 103
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/GlobalConfigurationTest.java
  5. 0 109
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/IdWorkerTest.java
  6. 0 73
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/MybatisMapperRefreshTest.java
  7. 0 40
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/StringUtilsTest.java
  8. 0 133
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/activerecord/ActiveRecordTest.java
  9. 0 65
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteSqlParserTest.java
  10. 0 125
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteTest.java
  11. 0 163
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MapUnderline2CamelTest.java
  12. 0 280
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjAndVersionAndOptLockTest.java
  13. 0 120
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandlerTest.java
  14. 0 261
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MvcCaseTest.java
  15. 0 64
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2Pagination4SqlTest.java
  16. 0 61
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2PersonCamelTest.java
  17. 0 109
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2SqlRunnerTest.java
  18. 0 75
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAddrJoinTest.java
  19. 0 105
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAutoincrementTest.java
  20. 0 179
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserDateVersionTest.java
  21. 0 311
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserExtendsTest.java
  22. 0 310
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoOptLockTest.java
  23. 0 238
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoVersionTest.java
  24. 0 255
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserTest.java
  25. 0 100
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserVersionIntWithARTest.java
  26. 0 62
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2uuidTest.java
  27. 0 364
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/AbstractH2UserTest.java
  28. 0 79
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/H2Test.java
  29. 0 46
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpH2Config.java
  30. 0 45
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpMysqlConfig.java
  31. 0 41
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBTomcatjdbcH2Config.java
  32. 0 64
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisConfigMetaObjOptLockConfig.java
  33. 0 71
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfigMapUnderline2Camel.java
  34. 0 64
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusLoginDeleteConfig.java
  35. 0 59
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusMetaObjConfig.java
  36. 0 56
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusNoOptLockConfig.java
  37. 0 65
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusSequenceConfig.java
  38. 0 20
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceConfig.java
  39. 0 20
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceSequenceConfig.java
  40. 0 85
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2PersonCamelMapper.java
  41. 0 88
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2PersonLogicDeleteMapper.java
  42. 0 30
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserDateVersionMapper.java
  43. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserExtendsMapper.java
  44. 0 36
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteMapper.java
  45. 0 15
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteWithARMapper.java
  46. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMetaobjMapper.java
  47. 0 30
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserNoVersionMapper.java
  48. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceExtendsMapper.java
  49. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceMapper.java
  50. 0 63
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java
  51. 0 28
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionIntWithARMapper.java
  52. 0 16
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2uuidMapper.java
  53. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseIntVersionEntity.java
  54. 0 32
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseSequenceEntity.java
  55. 0 104
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2Person.java
  56. 0 104
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2PersonLogicDelete.java
  57. 0 115
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserDateVersion.java
  58. 0 45
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserIntVersionExtendTO.java
  59. 0 58
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDelete.java
  60. 0 116
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDeleteWithAR.java
  61. 0 112
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserMetaObj.java
  62. 0 110
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserNoVersion.java
  63. 0 22
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSeq.java
  64. 0 61
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequence.java
  65. 0 50
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequenceExtendTO.java
  66. 0 118
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionAndLogicDeleteEntity.java
  67. 0 116
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionIntWithAR.java
  68. 0 59
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2uuid.java
  69. 0 55
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/hikaricp/H2HikaricpTest.java
  70. 0 16
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserExtendsService.java
  71. 0 16
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserLogicDeleteService.java
  72. 0 16
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserMetaobjService.java
  73. 0 31
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserNoVersionService.java
  74. 0 15
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceExtendsService.java
  75. 0 15
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceService.java
  76. 0 19
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserVersionIntWithARService.java
  77. 0 20
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserExtendsServiceImpl.java
  78. 0 29
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java
  79. 0 21
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserMetaobjServiceImpl.java
  80. 0 36
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserNoVersionServiceImpl.java
  81. 0 20
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceExtendsServiceImpl.java
  82. 0 20
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceServiceImpl.java
  83. 0 34
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserVersionIntWithARServiceImpl.java
  84. 0 57
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/tomcatjdbc/TomcatJdbcH2Test.java
  85. 0 63
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/CircularLabelsTest.java
  86. 0 83
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/LogicDeleteTest.java
  87. 0 35
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyBaseMapper.java
  88. 0 61
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyMetaObjectHandler.java
  89. 0 63
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MySqlInjector.java
  90. 0 70
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/NoXMLTest.java
  91. 0 57
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/ServiceImplTest.java
  92. 0 77
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/SqlRunnerTest.java
  93. 0 60
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/TransactionalTest.java
  94. 0 114
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/URPTest.java
  95. 0 334
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/UserMapperTest.java
  96. 0 77
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/NotPK.java
  97. 0 86
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/PhoneNumber.java
  98. 0 96
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Role.java
  99. 0 91
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Test.java
  100. 0 209
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/User.java

+ 36 - 13
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Sequence.java

@@ -37,26 +37,43 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 public class Sequence {
 
     private static final Log logger = LogFactory.getLog(Sequence.class);
-
-    /* 时间起始标记点,作为基准,一般取系统的最近时间(一旦确定不能变动) */
+    /**
+     * 时间起始标记点,作为基准,一般取系统的最近时间(一旦确定不能变动)
+     */
     private final long twepoch = 1288834974657L;
-    private final long workerIdBits = 5L;/* 机器标识位数 */
+    /**
+     * 机器标识位数
+     */
+    private final long workerIdBits = 5L;
     private final long datacenterIdBits = 5L;
     private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
     private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
-    private final long sequenceBits = 12L;/* 毫秒内自增位 */
+    /**
+     * 毫秒内自增位
+     */
+    private final long sequenceBits = 12L;
     private final long workerIdShift = sequenceBits;
     private final long datacenterIdShift = sequenceBits + workerIdBits;
-    /* 时间戳左移动位 */
+    /**
+     * 时间戳左移动位
+     */
     private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
     private final long sequenceMask = -1L ^ (-1L << sequenceBits);
 
     private long workerId;
 
-    /* 数据标识id部分 */
+    /**
+     * 数据标识 ID 部分
+     */
     private long datacenterId;
-    private long sequence = 0L;/* 0,并发控制 */
-    private long lastTimestamp = -1L;/* 上次生产id时间戳 */
+    /**
+     * 并发控制
+     */
+    private long sequence = 0L;
+    /**
+     * 上次生产 ID 时间戳
+     */
+    private long lastTimestamp = -1L;
 
     public Sequence() {
         this.datacenterId = getDatacenterId(maxDatacenterId);
@@ -64,6 +81,10 @@ public class Sequence {
     }
 
     /**
+     * <p>
+     * 有参构造器
+     * </p>
+     *
      * @param workerId     工作机器ID
      * @param datacenterId 序列号
      */
@@ -132,7 +153,8 @@ public class Sequence {
      */
     public synchronized long nextId() {
         long timestamp = timeGen();
-        if (timestamp < lastTimestamp) {//闰秒
+        //闰秒
+        if (timestamp < lastTimestamp) {
             long offset = lastTimestamp - timestamp;
             if (offset <= 5) {
                 try {
@@ -163,10 +185,11 @@ public class Sequence {
 
         lastTimestamp = timestamp;
 
-        return ((timestamp - twepoch) << timestampLeftShift)    // 时间戳部分
-            | (datacenterId << datacenterIdShift)           // 数据中心部分
-            | (workerId << workerIdShift)                   // 机器标识部分
-            | sequence;                                     // 序列号部分
+        // 时间戳部分 | 数据中心部分 | 机器标识部分 | 序列号部分
+        return ((timestamp - twepoch) << timestampLeftShift)
+            | (datacenterId << datacenterIdShift)
+            | (workerId << workerIdShift)
+            | sequence;
     }
 
     protected long tilNextMillis(long lastTimestamp) {

+ 0 - 66
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/CrudTest.java

@@ -1,66 +0,0 @@
-/*
- * 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.extension.test;
-
-import java.io.InputStream;
-
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.ibatis.session.SqlSessionFactory;
-
-import com.baomidou.mybatisplus.core.MybatisSessionFactoryBuilder;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-
-
-/**
- * <p>
- * CRUD 测试
- * </p>
- *
- * @author hubin
- * @date 2017-06-18
- */
-public class CrudTest {
-
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig global = GlobalConfigUtils.defaults();
-        // global.setAutoSetDbType(true);
-        // 设置全局校验机制为FieldStrategy.Empty
-        global.getDbConfig().setFieldStrategy(2);
-        return global;
-    }
-
-    public SqlSessionFactory sqlSessionFactory() {
-        return sqlSessionFactory("mysql-config.xml");
-    }
-
-    public SqlSessionFactory sqlSessionFactory(String configXml) {
-        GlobalConfig global = this.globalConfiguration();
-        BasicDataSource dataSource = new BasicDataSource();
-        dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-        dataSource.setUrl("jdbc:mysql://127.0.0.1:3306/mybatis-plus?characterEncoding=UTF-8");
-        dataSource.setUsername("root");
-        dataSource.setPassword("521");
-        dataSource.setMaxTotal(1000);
-        //GlobalConfigUtils.setMetaData(dataSource, global);
-        // 加载配置文件
-        InputStream inputStream = CrudTest.class.getClassLoader().getResourceAsStream(configXml);
-        MybatisSessionFactoryBuilder factoryBuilder = new MybatisSessionFactoryBuilder();
-        factoryBuilder.setGlobalConfig(global);
-        return factoryBuilder.build(inputStream);
-    }
-
-}

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

@@ -1,459 +0,0 @@
-/*
- * 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 EntityWrapperS 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.extension.test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.enums.SqlLike;
-import com.baomidou.mybatisplus.core.metadata.Column;
-import com.baomidou.mybatisplus.core.metadata.Columns;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-
-/**
- * <p>
- * 条件查询测试
- * </p>
- *
- * @author hubin
- * @date 2016-08-19
- */
-public class EntityWrapperTest {
-
-
-    /*
-     * User 查询包装器
-     */
-    private EntityWrapper<User> ew = new EntityWrapper<>();
-
-    @Test
-    public void test() {
-        /*
-         * 无条件测试
-		 */
-        Assert.assertEquals("", ew.originalSql());
-    }
-
-    @Test
-    public void test11() {
-        /*
-         * 实体带where ifneed
-		 */
-        ew.setEntity(new User(1));
-        ew.where("name={0}", "'123'");
-        // 测试克隆
-        String sqlSegment = ew.clone().eq("a", 1).originalSql();
-        Assert.assertEquals("AND (name=? AND a = ?)", sqlSegment);
-        System.err.println("test11-clone = " + sqlSegment);
-        ew.addFilterIfNeed(false, "id=12");
-        sqlSegment = ew.originalSql();
-        System.err.println("test11 = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)", sqlSegment);
-    }
-
-    @Test
-    public void test12() {
-        /*
-         * 实体带where orderby
-		 */
-        ew.setEntity(new User(1));
-        ew.where("name={0}", "'123'").orderBy("id", false);
-        String sqlSegment = ew.originalSql();
-        System.err.println("test12 = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)\nORDER BY id DESC", sqlSegment);
-    }
-
-    @Test
-    public void test13() {
-        /*
-         * 实体排序
-		 */
-        ew.setEntity(new User(1));
-        ew.orderBy("id", false);
-        String sqlSegment = ew.originalSql();
-        System.err.println("test13 = " + sqlSegment);
-        Assert.assertEquals("ORDER BY id DESC", sqlSegment);
-    }
-
-    @Test
-    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);
-        Assert.assertEquals("AND (name=?)\nORDER BY id", sqlSegment);
-    }
-
-    @Test
-    public void test22() {
-        ew.where("name={0}", "'123'").orderBy("id", false);
-        String sqlSegment = ew.originalSql();
-        System.err.println("test22 = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)\nORDER BY id DESC", sqlSegment);
-    }
-
-    @Test
-    public void test23() {
-        /*
-         * 无实体查询,只排序
-		 */
-        ew.orderBy("id", false);
-        String sqlSegment = ew.originalSql();
-        System.err.println("test23 = " + sqlSegment);
-        Assert.assertEquals("ORDER BY id DESC", sqlSegment);
-    }
-
-    @Test
-    public void testNoTSQL() {
-        /*
-         * 实体 filter orderby
-		 */
-        ew.setEntity(new User(1));
-        ew.addFilter("name={0}", "'123'").orderBy("id,name");
-        String sqlSegment = ew.originalSql();
-        System.err.println("testNoTSQL = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)\nORDER BY id,name", sqlSegment);
-    }
-
-    @Test
-    public void testNoTSQL1() {
-        /*
-         * 非 T-SQL 无实体查询
-		 */
-        ew.addFilter("name={0}", "'123'").addFilterIfNeed(false, "status=?", "1");
-        String sqlSegment = ew.originalSql();
-        System.err.println("testNoTSQL1 = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)", sqlSegment);
-    }
-
-    @Test
-    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")
-            .groupBy("x2,x3").having("x1=11").having("x3=433").orderBy("dd").orderBy("d1,d2");
-        System.out.println(ew.originalSql());
-        Assert.assertEquals("AND (name=? AND id=1) \n" + "OR (status=? OR status=1 AND nlike NOT LIKE ?) \n"
-            + "AND (new=xx AND hhh LIKE ?) \n" + "AND (pwd=11 AND n1 IS NOT NULL AND n2 IS NOT NULL AND n3 IS NULL)\n"
-            + "GROUP BY x1, x2,x3\n" + "HAVING (x1=11 AND x3=433)\n" + "ORDER BY dd, d1,d2", ew.originalSql());
-    }
-
-    @Test
-    public void testNull() {
-        ew.orderBy(null);
-        String sqlPart = ew.originalSql();
-        Assert.assertEquals("", sqlPart);
-    }
-
-    @Test
-    public void testNull2() {
-        ew.like(null, null).where("aa={0}", "'bb'").orderBy(null);
-        String sqlPart = ew.originalSql();
-        Assert.assertEquals("AND (aa=?)", sqlPart);
-    }
-
-    /**
-     * 测试带单引号的值是否不会再次添加单引号
-     */
-    @Test
-    public void testNul14() {
-        ew.where("id={0}", "'11'").and("name={0}", 22);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (id=? AND name=?)", sqlPart);
-    }
-
-    /**
-     * 测试带不带单引号的值是否会自动添加单引号
-     */
-    @Test
-    public void testNul15() {
-        ew.where("id={0} and ids = {1}", "11", 22).and("name={0}", 222222222);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (id=? and ids = ? AND name=?)", sqlPart);
-    }
-
-    /**
-     * 测试EXISTS
-     */
-    @Test
-    public void testNul16() {
-        ew.notExists("(select * from user)");
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND ( NOT EXISTS ((select * from user)))", sqlPart);
-    }
-
-    /**
-     * 测试NOT IN
-     */
-    @Test
-    public void test17() {
-        List<String> list = new ArrayList<>();
-        list.add("'1'");
-        list.add("'2'");
-        list.add("'3'");
-        ew.notIn("test_type", list);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (test_type NOT IN (?,?,?))", sqlPart);
-    }
-
-    /**
-     * 测试IN
-     */
-    @Test
-    public void testNul18() {
-        List<Long> list = new ArrayList<>();
-        list.add(111111111L);
-        list.add(222222222L);
-        list.add(333333333L);
-        ew.in("test_type", list);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (test_type IN (?,?,?))", sqlPart);
-    }
-
-    /**
-     * 测试IN
-     */
-    @Test
-    public void test18() {
-        Set<Long> list = new TreeSet<>();
-        list.add(111111111L);
-        list.add(222222222L);
-        list.add(333333333L);
-        ew.in("test_type", list);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (test_type IN (?,?,?))", sqlPart);
-    }
-
-    /**
-     * 测试BETWEEN AND
-     */
-    @Test
-    public void testNul19() {
-        String val1 = "11";
-        String val2 = "33";
-        ew.between("test_type", val1, val2);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (test_type BETWEEN ? AND ?)", sqlPart);
-    }
-
-    /**
-     * 测试Escape
-     */
-    @Test
-    public void testEscape() {
-        String val1 = "'''";
-        String val2 = "\\";
-        ew.between("test_type", val1, val2);
-        String sqlPart = ew.originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("AND (test_type BETWEEN ? AND ?)", sqlPart);
-    }
-
-    /**
-     * 测试Escape
-     */
-    @Test
-    public void testInstance() {
-        String val1 = "'''";
-        String val2 = "\\";
-        //TODO: 3.0
-//        String sqlPart = Condition.create().between("test_type", val1, val2).originalSql();
-//        System.out.println("sql ==> " + sqlPart);
-//        Assert.assertEquals("AND (test_type BETWEEN ? AND ?)", sqlPart);
-    }
-
-    /**
-     * 测试Qbc
-     */
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testQbc() {
-        Map<String, Object> map = new TreeMap<>();
-        map.put("allEq1", "22");
-        map.put("allEq2", 3333);
-        map.put("allEq3", 66.99);
-        //TODO: 3.0
-//        String sqlPart = Condition.create().gt("gt", 1).le("le", 2).lt("le", 3).ge("ge", 4).eq("eq", 5).allEq(map).originalSql();
-//        System.out.println("sql ==> " + sqlPart);
-//        Assert.assertEquals(
-//                "AND (gt > ? AND le <= ? AND le < ? AND ge >= ? AND eq = ? AND allEq1 = ? AND allEq2 = ? AND allEq3 = ?)",
-//                sqlPart);
-    }
-
-    /**
-     * 测试LIKE
-     */
-    @Test
-    public void testlike() {
-        //TODO: 3.0
-//        String sqlPart = Condition.create().like("default", "default", SqlLike.DEFAULT).like("left", "left", SqlLike.LEFT)
-//                .like("right", "right", SqlLike.RIGHT).originalSql();
-//        System.out.println("sql ==> " + sqlPart);
-//        Assert.assertEquals("AND (default LIKE ? AND left LIKE ? AND right LIKE ?)", sqlPart);
-    }
-
-    /**
-     * 测试isWhere
-     */
-    @Test
-    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);
-        ew.in("aaabbbcc", "1,3,4");
-        String sqlPart = ew.in("bbb", Arrays.asList(new String[]{"a", "b", "c"})).like("right", "right", SqlLike.RIGHT).isWhere(true)
-            .eq("bool", true).between("ee", "1111", "222").originalSql();
-        System.out.println("sql ==> " + sqlPart);
-        Assert.assertEquals("WHERE (sql = ? AND default LIKE ? AND left LIKE ? AND aaabbbcc IN (?,?,?) AND bbb IN (?,?,?) AND right LIKE ? AND bool = ? AND ee BETWEEN ? AND ?)", sqlPart);
-        System.out.println(ew.getSqlSegment());
-    }
-
-    /**
-     * 测试 last
-     */
-    @Test
-    public void testLimit() {
-        ew.where("name={0}", "'123'").orderBy("id", false);
-        ew.last("limit 1,2");
-        String sqlSegment = ew.originalSql();
-        System.err.println("testLimit = " + sqlSegment);
-        Assert.assertEquals("AND (name=?)\nORDER BY id DESC limit 1,2", sqlSegment);
-    }
-
-    /**
-     * 测试 sqlselect
-     */
-    @Test
-    public void testSqlSelectStrings() {
-        EntityWrapper entityWrapper = new EntityWrapper();
-        entityWrapper.setSqlSelect("name", "age", "sex");
-        System.out.println(entityWrapper.getSqlSelect());
-        Assert.assertEquals("name,age,sex", entityWrapper.getSqlSelect());
-    }
-
-    /**
-     * 测试 sqlselect
-     */
-    @Test
-    public void testSqlSelect() {
-        EntityWrapper entityWrapper = new EntityWrapper();
-        // entityWrapper.setSqlSelect(Column.create().column("col").as("name"),null,Column.create(),Column.create().as("11"),Column.create().column("col"));
-        entityWrapper.setSqlSelect(Column.create().column("col").as("name"), null, Column.create(), Column.create().as("11"), Column.create().column("col"));
-        System.out.println(entityWrapper.getSqlSelect());
-        Assert.assertNotNull("col AS name,col", entityWrapper.getSqlSelect());
-
-    }
-
-    /**
-     * 测试 sqlselect
-     */
-    @Test
-    public void testSqlSelectColumns() {
-        EntityWrapper entityWrapper = new EntityWrapper();
-        Columns columns = Columns.create().column("name", "name1").column("age").column("sex", "sex1", false);
-        entityWrapper.setSqlSelect(columns);
-        System.out.println(entityWrapper.getSqlSelect());
-        Assert.assertEquals("name AS name1,age,sex AS sex1", entityWrapper.getSqlSelect());
-    }
-
-    /**
-     * 测试 EntityWrapper orderBy
-     */
-    @Test
-    public void testEntityWrapperOrderBy() {
-        EntityWrapper entityWrapper = new EntityWrapper();
-        entityWrapper.orderBy("id desc");
-        System.out.println(entityWrapper.getSqlSegment());
-        Assert.assertEquals("ORDER BY id desc", entityWrapper.getSqlSegment());
-    }
-
-    /**
-     * 测试 Condition orderBy
-     */
-    @Test
-    public void testConditionOrderBy() {
-        //TODO: 3.0
-//        Wrapper wrapper = Condition.create().orderBy("id desc");
-//        System.out.println(wrapper.getSqlSegment());
-//        Assert.assertEquals("ORDER BY id desc", wrapper.getSqlSegment());
-    }
-
-    /**
-     * 测试 Condition orderBy
-     */
-    @Test
-    public void testConditionOrderBys() {
-        //空集合测试
-        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 = ?))");
-    }
-
-}

+ 0 - 103
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/GlobalConfigurationTest.java

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Assert;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.NotPK;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.NotPKMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
-
-/**
- * <p>
- * 全局配置测试
- * </p>
- *
- * @author Caratacus
- * @Date 2016-12-22
- */
-public class GlobalConfigurationTest extends CrudTest {
-
-    /**
-     * 全局配置测试
-     */
-    @org.junit.Test
-    public void testGlobalConfig() {
-        SqlSession session = this.sqlSessionFactory().openSession(false);
-        TestMapper testMapper = session.getMapper(TestMapper.class);
-        /*Wrapper type = Condition.instance().eq("id",1).or().in("type", new Object[]{1, 2, 3, 4, 5, 6});
-        List list = testMapper.selectList(type);
-        System.out.println(list.toString());*/
-        Test test = new Test();
-        test.setCreateTime(new Date());
-        // 开启全局校验字符串会忽略空字符串
-        test.setType("");
-        testMapper.insert(test);
-
-        SqlSession sqlSession = this.sqlSessionFactory().openSession(false);
-        NotPKMapper pkMapper = sqlSession.getMapper(NotPKMapper.class);
-        NotPK notPK = new NotPK();
-        notPK.setUuid(UUID.randomUUID().toString());
-        notPK.setIs(true);
-        notPK.setIsis(false);
-        int num = pkMapper.insert(notPK);
-        Assert.assertTrue(num > 0);
-        NotPK notPK1 = pkMapper.selectOne(notPK);
-        Assert.assertNotNull(notPK1);
-        List<NotPK> notPKS = pkMapper.selectPage(RowBounds.DEFAULT, new EntityWrapper<>(notPK));
-        System.out.println(notPKS);
-        //TODO: 3.0
-//        Wrapper type = Condition.create().eq("type", 12121212);
-//        Assert.assertFalse(type.isEmptyOfWhere());
-//        System.out.println(type.getSqlSegment());
-//        Assert.assertFalse(type.isEmptyOfWhere());
-//        pkMapper.selectPage(RowBounds.DEFAULT, type);
-        NotPK notPK2 = null;
-        try {
-            notPK2 = pkMapper.selectById("1");
-        } catch (Exception e) {
-            System.out.println("因为没有主键,所以没有注入该方法");
-        }
-        Assert.assertNull(notPK2);
-        int count = pkMapper.selectCount(Condition.EMPTY);
-        //TODO: 3.0
-//        pkMapper.selectList(Condition.<NotPK>wrapper().orderBy("uuid"));
-//        pkMapper.selectList(Condition.<NotPK>wrapper().eq("uuid", "uuid").orderBy("uuid"));
-        Assert.assertTrue(count > 0);
-        int deleteCount = pkMapper.delete(null);
-        Assert.assertTrue(deleteCount > 0);
-        List<String> list = new ArrayList<>();
-        list.add("1");
-        list.add("2");
-        list.add("3");
-        RoleMapper mapper = sqlSession.getMapper(RoleMapper.class);
-        System.out.println(mapper.selectBatchIds(list));
-        System.out.println(mapper.selectBatchIds(new HashSet<>(list)));
-        sqlSession.commit();
-    }
-
-}

+ 0 - 109
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/IdWorkerTest.java

@@ -1,109 +0,0 @@
-/*
- * 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.extension.test;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import org.junit.Assert;
-
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.plugins.RandomUtils;
-
-/**
- * <p>
- * IdWorker 并发测试
- * </p>
- *
- * @author hubin
- * @date 2016-08-01
- */
-public class IdWorkerTest {
-
-    public static void main(String[] args) throws Exception {
-        IdWorkerTest test = new IdWorkerTest();
-        test.test();
-        test.test1();
-        test.test2();
-    }
-
-    //@Test
-    public void test() throws Exception {
-        int count = 1000;
-        System.err.println("共有" + count + "个数参与测试");
-
-        ExecutorService executorService = Executors.newFixedThreadPool(20);
-        final List<Long> results = new ArrayList<>();
-        CompletionService<Long> cs = new ExecutorCompletionService<>(executorService);
-        for (int i = 1; i < count; i++) {
-            cs.submit(new Callable<Long>() {
-                public Long call() throws Exception {
-                    Thread.sleep(RandomUtils.nextInt(1, 2000));
-                    return IdWorker.getId();
-                }
-            });
-        }
-        for (int i = 0; i < count; i++) {
-            Future<Long> future = executorService.submit(new Callable<Long>() {
-                @Override
-                public Long call() throws Exception {
-                    return IdWorker.getId();
-                }
-            });
-            results.add(future.get());
-        }
-        executorService.shutdown();
-        HashSet<Long> set = new HashSet<>(results);
-        // 判断是否有重复
-        Assert.assertEquals(count, set.size());
-        int odd = 0;
-        int even = 0;
-        for (Long id : results) {
-            if (id % 2 != 0) {
-                odd++;
-            } else {
-                even++;
-            }
-        }
-        System.err.println("奇数:" + odd);
-        System.err.println("偶数:" + even);
-    }
-
-    //@Test
-    public void test1() throws Exception {
-        // 毫秒内并发
-        for (int i = 0; i < 1000; i++) {
-            System.out.println(IdWorker.getId());
-        }
-    }
-
-
-    //@Test
-    public void test2() throws Exception {
-        // 随机尾数
-        for (int i = 0; i < 1000; i++) {
-            Thread.sleep(10);
-            System.out.println(IdWorker.getId());
-        }
-    }
-}

+ 0 - 73
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/MybatisMapperRefreshTest.java

@@ -1,73 +0,0 @@
-/*
- * 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.extension.test;
-
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import com.baomidou.mybatisplus.core.pagination.Pagination;
-import com.baomidou.mybatisplus.core.toolkit.SystemClock;
-import com.baomidou.mybatisplus.extension.spring.MybatisMapperRefresh;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-
-/**
- * <p>
- * 切莫用于生产环境(后果自负)<br>
- * Mybatis 映射文件热加载(发生变动后自动重新加载).<br>
- * 方便开发时使用,不用每次修改xml文件后都要去重启应用.<br>
- * </p>
- *
- * @author nieqiurong
- * @Date 2016-08-25
- */
-public class MybatisMapperRefreshTest extends CrudTest {
-
-
-    /**
-     * 测试 Mybatis XML 修改自动刷新
-     */
-    public static void main(String[] args) throws Exception {
-        Resource[] resource = new ClassPathResource[]{new ClassPathResource("mysql/UserMapper.xml")};
-        SqlSessionFactory sessionFactory = new CrudTest().sqlSessionFactory();
-        new MybatisMapperRefresh(resource, sessionFactory, 0, 5, true);
-        boolean isReturn = false;
-        SqlSession session = null;
-        while (!isReturn) {
-            try {
-                session = sessionFactory.openSession();
-                UserMapper userMapper = session.getMapper(UserMapper.class);
-                userMapper.selectListRow(new Pagination(1, 10));
-                resource[0].getFile().setLastModified(SystemClock.now());
-                session.commit();
-                session.close();
-                Thread.sleep(5000);
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (session != null) {
-                    session.close();
-                }
-                Thread.sleep(5000);
-            }
-        }
-        System.exit(0);
-    }
-
-}

+ 0 - 40
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/StringUtilsTest.java

@@ -1,40 +0,0 @@
-/*
- * 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.extension.test;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-
-
-/**
- * <p>
- * 字符串工具类测试
- * </p>
- *
- * @author hubin
- * @date 2017-06-27
- */
-public class StringUtilsTest {
-
-    @Test
-    public void removePrefixAfterPrefixToLower() {
-        Assert.assertEquals("user", StringUtils.removePrefixAfterPrefixToLower("isUser", 2));
-        Assert.assertEquals("userInfo", StringUtils.removePrefixAfterPrefixToLower("isUserInfo", 2));
-        Assert.assertEquals(true, StringUtils.isMixedMode("Xxx_ss1aa"));
-    }
-}

+ 0 - 133
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/activerecord/ActiveRecordTest.java

@@ -1,133 +0,0 @@
-/*
- * 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.extension.test.activerecord;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.jdbc.SQL;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
-
-
-/**
- * <p>
- * ActiveRecord 测试
- * </p>
- *
- * @author Caratacus
- * @date 2016-10-11
- */
-public class ActiveRecordTest extends CrudTest {
-
-    @org.junit.Test
-    public void test() {
-        TableInfoHelper.initSqlSessionFactory(this.sqlSessionFactory());
-        // 保存一条记录
-        Test t1 = new Test();
-        t1.setType("test10");
-        boolean rlt = t1.insert();
-        print(" ar save=" + rlt + ", id=" + t1.getId());
-
-        // 根据ID更新
-        t1.setType("t1001");
-        rlt = t1.updateAllColumnById();
-        print(" ar updateAllColumnById:" + rlt);
-
-        t1.setType("t1023");
-        rlt = t1.updateById();
-        print(" ar updateById:" + rlt);
-
-        // 更新 SQL
-        Test t11 = new Test();
-        t11.setType("123");
-        rlt = t11.update("id={0}", t1.getId());
-        print("update sql=" + rlt);
-
-        // 查询 SQL
-        Test t10 = t1.selectOne("id={0}", t1.getId());
-        print("selectOne=" + t10.getType());
-
-        // 插入OR更新
-        t1.setType("t1021");
-        rlt = t1.insertOrUpdate();
-        print(" ar saveOrUpdate:" + rlt);
-
-        // 根据ID查询
-        Test t2 = t1.selectById();
-        print(" t2 = " + t2.toString());
-        t2.setId(IdWorker.getId());
-        t2.insert();
-
-        // 查询所有
-        List<Test> tl = t2.selectAll();
-        for (Test t : tl) {
-            print("selectAll=" + t.toString());
-        }
-
-        // 查询总记录数
-        print(" count=" + t2.selectCount(null));
-
-        // 翻页查询
-        Page<Test> page = new Page<>(0, 10);
-        page = t2.selectPage(page, null);
-        print(page.toString());
-
-        // 根据ID删除
-        rlt = t2.deleteById();
-        print("deleteById=" + rlt + ", id=" + t2.getId());
-
-        // 执行 SQL 查询总数
-        List<Map<String, Object>> ul = t2.sql().selectList(new SQL() {
-            {
-                SELECT("*");
-                FROM("test");
-                WHERE("type='t1021'");
-            }
-        }.toString());
-        System.err.println("selectList SQL:");
-        for (Map<String, Object> map : ul) {
-            System.err.println(map);
-        }
-
-        // 根据ID查询
-        Test t20 = t2.selectById();
-        print("t2 删除后是否存在?" + (null != t20));
-
-        // 删除 SQL
-        rlt = t2.delete("type={0}", "t1021");
-        System.err.println("delete sql=" + rlt);
-    }
-
-    /*
-     * 慢点打印
-     */
-    private static void print(String text) {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        System.err.println(text);
-    }
-
-}

+ 0 - 65
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteSqlParserTest.java

@@ -1,65 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2PersonLogicDeleteMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2PersonLogicDelete;
-
-/**
- * <p>
- * 逻辑删除 - 自定义sql也带上逻辑删除标识
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {ServiceConfig.class})
-public class H2LogicDeleteSqlParserTest extends H2Test {
-
-    @BeforeClass
-    public static void init() throws SQLException, IOException {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2-mvc-camel.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn, "person.ddl.sql", "person.insert.sql", "h2person");
-            initData(conn, "addr.ddl.sql", "addr.insert.sql", "h2address");
-        }
-    }
-
-    @Autowired
-    private H2PersonLogicDeleteMapper personMapper;
-
-    @Test
-    public void testInsert() {
-        H2PersonLogicDelete person = new H2PersonLogicDelete();
-        person.setName("abc").setTestType(1);
-        personMapper.insert(person);
-        Long id = person.getId();
-        person = personMapper.selectById(id);
-        System.out.println(person);
-    }
-
-
-    @Test
-    public void testMySelect() {
-        personMapper.getAddrListByUserId(1L);
-        //TODO: 然并无
-    }
-
-}

+ 0 - 125
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2LogicDeleteTest.java

@@ -1,125 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
-
-/**
- * <p>
- * H2LogicDeleteTest
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {ServiceConfig.class})
-public class H2LogicDeleteTest extends H2Test {
-
-    @BeforeClass
-    public static void init() throws SQLException, IOException {
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(ServiceConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Autowired
-    private IH2UserLogicDeleteService userService;
-
-    @Test
-    public void testInsert() {
-        H2UserLogicDelete user = new H2UserLogicDelete();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        user.setVersion(1);
-        userService.insert(user);
-        Long id = user.getId();
-        Assert.assertNotNull(id);
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        System.out.println("************************************");
-        System.out.println("*********" + user.getVersion());
-        System.out.println("************************************");
-        user = new H2UserLogicDelete();
-        user.setId(id);
-        EntityWrapper<H2UserLogicDelete> ew = new EntityWrapper<>(user);
-        List<H2UserLogicDelete> list = userService.selectList(ew);
-        System.out.println("************************************");
-        System.out.println("*********" + list.size());
-        System.out.println("************************************");
-        H2UserLogicDelete userFromDB = userService.selectById(user.getId());
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-        Assert.assertEquals(1, userFromDB.getVersion().intValue());
-        Page page = new Page();
-
-        page.setOrderByField("desc");
-        //TODO 3.0
-//        userService.selectPage(page, Condition.create().eq("desc", "111"));
-        userService.deleteById(id);
-        list = userService.selectList(ew);
-        System.out.println("************************************");
-        System.out.println("*********" + list.size());
-        System.out.println("************************************");
-    }
-
-    @Test
-    public void testLogicDeleted() {
-        H2UserLogicDelete user = new H2UserLogicDelete();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        user.setVersion(-1);
-        userService.insert(user);
-        Long id = user.getId();
-        Assert.assertNotNull(id);
-        //TODO 3.0
-//        Assert.assertNotNull(userService.selectList(Condition.create().orderBy("age")));
-        H2UserLogicDelete userFromDB = userService.selectById(user.getId());
-        Assert.assertNull(userFromDB);
-    }
-
-    @Test
-    public void testDelete() {
-        H2UserLogicDelete user = new H2UserLogicDelete();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        user.setVersion(1);
-        userService.insert(user);
-        Long id = user.getId();
-        Assert.assertNotNull(id);
-        Assert.assertTrue(userService.deleteById(id));
-        H2UserLogicDelete fromDB = userService.selectByIdMy(id);
-        Assert.assertNotNull(fromDB);
-        System.out.println(fromDB);
-    }
-
-    @Test
-    public void testSelectBatchIds() {
-        userService.selectBatchIds(Arrays.asList(101, 102, 103, 104));
-
-    }
-}

+ 0 - 163
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MapUnderline2CamelTest.java

@@ -1,163 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.DBConfig;
-import com.baomidou.mybatisplus.extension.test.h2.config.MybatisPlusConfigMapUnderline2Camel;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-
-/**
- * <p>
- * 测试返回Map结果集,下划线自动转驼峰
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/12/19
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DBConfig.class, MybatisPlusConfigMapUnderline2Camel.class})
-public class H2MapUnderline2CamelTest extends H2Test {
-
-    @Autowired
-    IH2UserService userService;
-
-    @Autowired
-    H2UserMapper h2UserMapper;
-
-    @BeforeClass
-    public static void init() throws SQLException, IOException {
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(DBConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testMapUnderline2Camel() {
-        List<Map<String, Object>> list = userService.selectMaps(new EntityWrapper<H2User>());
-        for (Map<String, Object> map : list) {
-            System.out.println(map);
-            Object obj = map.get("TEST_DATE");
-            if (obj != null) {
-                System.out.println("TEST_DATE.class" + obj.getClass().getName());
-            } else {
-                obj = map.get("test_date");
-                if (obj != null) {
-                    System.out.println("test_date.class" + obj.getClass().getName());
-                } else {
-                    obj = map.get("testDate");
-                    if (obj != null) {
-                        System.out.println("testDate.class" + obj.getClass().getName());
-                    } else {
-                        obj = map.get("TESTDATE");
-                        if (obj != null) {
-                            System.out.println("TESTDATE.class" + obj.getClass().getName());
-                        } else {
-                            obj = map.get("testdate");
-                            if (obj != null) {
-                                System.out.println("testdate.class" + obj.getClass().getName());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Test
-    public void testMapUnderline2CamelMyMethods() {
-        List<Map> list = userService.mySelectMaps();
-        for (Map map : list) {
-            System.out.println(JSONObject.toJSON(map));
-            System.out.println("TESTID=" + map.get("TESTID"));
-            System.out.println("testid=" + map.get("testid"));
-            System.out.println("testId=" + map.get("testId"));
-            System.out.println("TEST_ID=" + map.get("TEST_ID"));
-            System.out.println("test_id=" + map.get("test_id"));
-//            Assert.assertNotNull("test_id should be auto converted to testId", map.get("testId"));
-//            Assert.assertNull("test_id should be auto converted to testId", map.get("TESTID"));
-//            Assert.assertNull("test_id should be auto converted to testId", map.get("testid"));
-//            Assert.assertNull("test_id should be auto converted to testId", map.get("TEST_ID"));
-//            Assert.assertNull("test_id should be auto converted to testId", map.get("test_id"));
-//            Assert.assertNotNull("test_type should be auto converted to testType", map.get("testType"));
-        }
-    }
-
-    @Test
-    public void testSelectSql4SelectMaps() {
-        EntityWrapper<H2User> ew = new EntityWrapper<>();
-        ew.setSqlSelect("test_id, test_type");
-        List<Map<String, Object>> list = userService.selectMaps(ew);
-        for (Map<String, Object> map : list) {
-            System.out.println(map);
-            Object obj = map.get("TEST_DATE");
-            if (obj != null) {
-                System.out.println("TEST_DATE.class" + obj.getClass().getName());
-            } else {
-                obj = map.get("test_date");
-                if (obj != null) {
-                    System.out.println("test_date.class" + obj.getClass().getName());
-                } else {
-                    obj = map.get("testDate");
-                    if (obj != null) {
-                        System.out.println("testDate.class" + obj.getClass().getName());
-                    } else {
-                        obj = map.get("TESTDATE");
-                        if (obj != null) {
-                            System.out.println("TESTDATE.class" + obj.getClass().getName());
-                        } else {
-                            obj = map.get("testdate");
-                            if (obj != null) {
-                                System.out.println("testdate.class" + obj.getClass().getName());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Test
-    public void testSelectSqlNotMapping() {
-        EntityWrapper<H2User> ew = new EntityWrapper<>();
-        ew.setSqlSelect("test_id, test_type");
-        List<H2User> list = userService.selectList(ew);
-        for (H2User u : list) {
-            System.out.println(JSONObject.toJSON(u));
-            Assert.assertNull("test_id is not null, but should not mapping to id", u.getId());
-            Assert.assertNotNull("test_type should be convert to testType", u.getTestType());
-        }
-    }
-
-    @Test
-    public void testMpSelect() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : list) {
-            Assert.assertNotNull("id should not be null", u.getId());
-            Assert.assertNotNull("test_type should not be null", u.getTestType());
-        }
-    }
-}

+ 0 - 280
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjAndVersionAndOptLockTest.java

@@ -1,280 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.DBConfig;
-import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/29
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DBConfig.class, MybatisConfigMetaObjOptLockConfig.class})
-public class H2MetaObjAndVersionAndOptLockTest extends H2Test {
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(DBConfig.class);
-        context.register(MybatisConfigMetaObjOptLockConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Autowired
-    H2UserVersionAndLogicDeleteMapper userMapper;
-
-    @Test
-    public void testInsert() {
-        Long id = 991L;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(null);
-        user.setVersion(1);
-        userMapper.insertAllColumn(user);
-
-        H2UserVersionAndLogicDeleteEntity userDB = userMapper.selectById(id);
-        Assert.assertEquals("lastUpdateDt should be null for insert()", null, userDB.getLastUpdatedDt());
-        Assert.assertNotNull("testType should not be null for insert() due to insertFill()", userDB.getTestType());
-
-        userDB.setName("991");
-        userMapper.updateById(userDB);
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("991", userDB.getName());
-        assertUpdateFill(userDB.getLastUpdatedDt());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNoDateVersion() {
-        Long id = 992L;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userMapper.insertAllColumn(user);
-
-        H2UserVersionAndLogicDeleteEntity userDB = userMapper.selectById(id);
-        Assert.assertEquals("testType will only be updated by insertFill() when testType is null ", 1, userDB.getTestType().intValue());
-
-        H2UserVersionAndLogicDeleteEntity updUser = new H2UserVersionAndLogicDeleteEntity();
-        updUser.setName("999");
-
-        userMapper.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("999", userDB.getName());
-        assertUpdateFill(userDB.getLastUpdatedDt());
-    }
-
-    @Test
-    public void testUpdateByIdWithDateVersion() {
-        Long id = 994L;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setId(id);
-        user.setName("994");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        user.setTestDate(cal.getTime());
-        userMapper.insertAllColumn(user);
-
-        System.out.println("before update: testDate=" + user.getTestDate());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
-        H2UserVersionAndLogicDeleteEntity userDB = userMapper.selectById(id);
-
-        Assert.assertNotNull(userDB.getTestDate());
-        String originalDateVersionStr = sdf.format(cal.getTime());
-        Assert.assertEquals(originalDateVersionStr, sdf.format(userDB.getTestDate()));
-
-        userDB.setName("991");
-        userMapper.updateById(userDB);
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("991", userDB.getName());
-        Date versionDate = userDB.getTestDate();
-        System.out.println("after update: testDate=" + versionDate);
-        String versionDateStr = sdf.format(versionDate);
-        Assert.assertEquals("@version field:testDate should be updated to current sysdate", sdf.format(new Date()), versionDateStr);
-
-        Assert.assertNotEquals("@version field should be updated", originalDateVersionStr, versionDateStr);
-
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperWithDateVersion() {
-        Long id = 993L;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        user.setTestDate(cal.getTime());
-        userMapper.insertAllColumn(user);
-
-        H2UserVersionAndLogicDeleteEntity userDB = userMapper.selectById(id);
-
-        H2UserVersionAndLogicDeleteEntity updUser = new H2UserVersionAndLogicDeleteEntity();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userMapper.update(updUser, new EntityWrapper<>(userDB));
-
-        System.out.println("before update: testDate=" + userDB.getTestDate());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("999", userDB.getName());
-
-        Date versionDate = userDB.getTestDate();
-        System.out.println("after update: testDate=" + versionDate);
-        String versionDateStr = sdf.format(versionDate);
-        Assert.assertEquals("@version field:testDate should be updated to current sysdate", sdf.format(new Date()), versionDateStr);
-        assertUpdateFill(userDB.getLastUpdatedDt());
-    }
-
-
-    @Test
-    public void testLogicDeleted() {
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        user.setVersion(-1);
-        userMapper.insert(user);
-        Long id = user.getId();
-        Assert.assertNotNull(id);
-        //TODO: 3.0
-//        Assert.assertNotNull(userMapper.selectList(Condition.create().orderBy("age")));
-        H2UserVersionAndLogicDeleteEntity userFromDB = userMapper.selectById(user.getId());
-        Assert.assertNull(userFromDB);
-    }
-
-    @Test
-    public void testLogicDeleteRecordWithAutoFill() {
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        user.setVersion(1);
-        userMapper.insert(user);
-        Assert.assertNotNull("testType should be auto filled", user.getTestType());
-        userMapper.deleteById(user);
-        Assert.assertNotNull("logicDelete should call update(), lastUpdateDt should be auto filled", user.getLastUpdatedDt());
-        Assert.assertNull("logic deleted, should not be retrieved", userMapper.selectById(user.getId()));
-        H2UserVersionAndLogicDeleteEntity userDB = userMapper.selectMyRecordById(user.getId());
-        Assert.assertNotNull("logic delete should not delete record physical", userDB);
-        Assert.assertEquals("logic delete should update version=-1", -1, userDB.getVersion().intValue());
-    }
-
-    @Test
-    public void testInsertMy() {
-        String name = "自定义insert";
-        int version = 1;
-        int row = userMapper.myInsertWithNameVersion(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setName(name);
-        user.setVersion(version);
-        int row = userMapper.myInsertWithParam(user);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithoutParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setName(name);
-        user.setVersion(version);
-        int row = userMapper.myInsertWithoutParam(user);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        Long id = 10087L;
-        H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
-        user.setId(id);
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userMapper.insert(user);
-
-        H2UserVersionAndLogicDeleteEntity dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userMapper.myUpdateWithNameId(id, "updateMy"));
-
-        dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals("自定义update需要自己控制version", 1, user.getVersion().intValue());
-    }
-
-
-    @Test
-    public void testCondition() {
-        Page<H2UserVersionAndLogicDeleteEntity> page = new Page<>(1, 3);
-        Map<String, Object> condition = new HashMap<>();
-        condition.put("test_type", 1);
-        page.setCondition(condition);
-        List<H2UserVersionAndLogicDeleteEntity> pageResult = userMapper.selectPage(page, new EntityWrapper<H2UserVersionAndLogicDeleteEntity>());
-        for (H2UserVersionAndLogicDeleteEntity u : pageResult) {
-            System.out.println(u);
-        }
-
-    }
-}

+ 0 - 120
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MetaObjectHandlerTest.java

@@ -1,120 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-
-/**
- * <p>
- * 测试元对象填充器
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/5/31
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2-metaobj.xml"})
-public class H2MetaObjectHandlerTest extends H2Test {
-
-    @Autowired
-    private H2UserMetaobjMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2-metaobj.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testMetaObjectHandler() {
-        H2UserMetaObj user = new H2UserMetaObj();
-        user.setName("metaobjtest");
-        user.setVersion(1);
-        user.setAge(12);
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        user.setLastUpdatedDt(new Timestamp(cal.getTimeInMillis()));
-        user.setDesc("abc");
-        userMapper.insert(user);
-        System.out.println("before update: getLastUpdatedDt=" + user.getLastUpdatedDt());
-        Assert.assertNotNull(userMapper.selectById(user.getId()).getTestType());
-
-        user.setName("999");
-        userMapper.updateById(user);
-        H2UserMetaObj userDB = userMapper.selectById(user.getId());
-        //MyMetaObjectHandler.insertFill() : set default testType value=3
-        Assert.assertEquals(3, userDB.getTestType().intValue());
-        Assert.assertEquals("999", userDB.getName());
-        assertUpdateFill(userDB.getLastUpdatedDt());
-    }
-
-    @Test
-    public void testMetaObjectHandlerNullInsert4Update() {
-        H2UserMetaObj user = new H2UserMetaObj();
-        user.setName("metaobjtest");
-        user.setVersion(1);
-        user.setAge(12);
-        user.setDesc("abc");
-        userMapper.insert(user);
-        System.out.println("before update: getLastUpdatedDt=" + user.getLastUpdatedDt());
-        Assert.assertNotNull(userMapper.selectById(user.getId()).getTestType());
-        user.setName("999");
-        userMapper.updateById(user);
-        H2UserMetaObj userDB = userMapper.selectById(user.getId());
-        assertUpdateFill(userDB.getLastUpdatedDt());
-    }
-
-
-    @Test
-    public void testInsertMy() {
-        String name = "testInsertMy";
-        int version = 1;
-        int row = userMapper.myInsertWithNameVersion(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        H2UserMetaObj user = new H2UserMetaObj();
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userMapper.insert(user);
-        Long id = user.getId();
-        H2UserMetaObj dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userMapper.myUpdateWithNameId(id, "updateMy"));
-
-        dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals(1, user.getVersion().intValue());
-    }
-
-}

+ 0 - 261
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2MvcCaseTest.java

@@ -1,261 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2-mvc.xml"})
-public class H2MvcCaseTest extends AbstractH2UserTest {
-
-    @Autowired
-    private IH2UserService userService;
-
-    @Autowired
-    H2UserMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2-mvc.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        insertSimpleCase();
-    }
-
-    @Test
-    public void testInsertBatch() {
-        insertBatchSimpleCase();
-    }
-
-    @Test
-    public void testDelete() {
-        deleteSimpleCase();
-    }
-
-    @Test
-    public void testSelectOne() {
-        selectOneSimpleCase();
-    }
-
-    @Test
-    public void testSelectList() {
-        selectListSimpleCase();
-    }
-
-    @Test
-    public void testSelectPage() {
-        Page<H2User> page = userService.selectPage(new Page<H2User>(1, 3));
-        Assert.assertEquals(3, page.getRecords().size());
-    }
-
-    @Test
-    public void testUpdateByIdOptLock() {
-        updateByIdWithOptLock();
-    }
-
-    @Test
-    public void testUpdateAllColumnByIdOptLock() {
-        updateAllColumnByIdCase();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLock() {
-        updateByEntityWrapperOptLock();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLockWithoutVersionVal() {
-        updateByEntityWrapperOptLockWithoutVersionVal();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNoEntity() {
-        updateByEntityWrapperNoEntity();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNull() {
-        updateByEntityWrapperNull();
-    }
-
-    @Test
-    public void testUpdateBatch() {
-        updateBatchSimpleCase();
-    }
-
-    @Test
-    public void testUpdateInLoop() {
-        updateInLoopCase();
-    }
-
-    @Test
-    public void testUpdateAllColumnInLoop() {
-        updateAllColumnInLoop();
-    }
-
-    @Test
-    public void testInsertMy() {
-        String name = "自定义insert";
-        int version = 1;
-        int row = userService.myInsert(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        int row = userService.myInsertWithParam(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithoutParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        int row = userService.myInsertWithoutParam(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        updateByMySql();
-    }
-
-
-    @Test
-    public void testCondition() {
-        Page<H2User> page = new Page<>(1, 3);
-        Map<String, Object> condition = new HashMap<>();
-        condition.put("test_type", 1);
-        page.setCondition(condition);
-        Page<H2User> pageResult = userService.selectPage(page);
-        for (H2User u : pageResult.getRecords()) {
-            System.out.println(u);
-        }
-        System.out.println(pageResult.getTotal());
-
-    }
-
-
-    @Test
-    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) {
-            Assert.assertNotNull(u.getId());
-            Assert.assertNotNull(u.getName());
-            Assert.assertNull(u.getPrice());
-        }
-
-    }
-
-    @Test
-    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) {
-            Assert.assertEquals(nameParam, u.getName());
-            Assert.assertNotNull(u.getId());
-        }
-    }
-
-    @Test
-    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));
-        Assert.assertNotNull(page.getRecords());
-        for (H2User u : page.getRecords()) {
-            Assert.assertEquals(nameParam, u.getName());
-            Assert.assertNotNull(u.getId());
-        }
-        Assert.assertNotEquals(0, page.getTotal());
-    }
-
-    @Test
-    public void testSelectCountWithParamInSelectItems() {
-        Map<String, Object> param = new HashMap<>();
-        String nameParam = "selectStmtParam";
-        param.put("nameParam", nameParam);
-        param.put("ageFrom", 1);
-        param.put("ageTo", 100);
-        int count = userService.selectCountWithParamInSelectItems(param);
-        Assert.assertNotEquals(0, count);
-    }
-
-    @Test
-    public void testPageWithDollarParamInSelectItems() {
-        Map<String, Object> param = new HashMap<>();
-        String nameParam = "selectStmtParam";
-        int ageFrom = 2;
-        param.put("nameParam", nameParam);
-        param.put("ageFrom", ageFrom);
-        param.put("ageTo", 100);
-        Page<H2User> page = new Page<H2User>(0, 10);
-        List<H2User> list = userMapper.selectUserWithDollarParamInSelectStatememt4Page(param, page);
-        Assert.assertNotEquals(0, page.getTotal());
-        H2User user = list.get(0);
-        Assert.assertNotNull("id is selected, should not be null", user.getId());
-        Assert.assertNotNull("age is selected, should not be null", user.getAge());
-        Assert.assertEquals("age is pow(" + ageFrom + ", 2)", 4, user.getAge().intValue());
-        Assert.assertEquals("name is selected, should not be null", "selectStmtParam", user.getName());
-
-    }
-
-    @Test
-    public void selectMapTest() {
-        userMapper.selectMaps(new EntityWrapper<H2User>());
-    }
-
-}

+ 0 - 64
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2Pagination4SqlTest.java

@@ -1,64 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-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.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-
-/**
- * <p>
- * 这个方法跟{@link H2UserAddrJoinTest} 一样,
- * 只是起名为了方便查询自定义分页查询
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2Pagination4SqlTest extends H2Test {
-
-    @Autowired
-    private H2UserMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        H2UserAddrJoinTest.initDB();
-    }
-
-    @Test
-    public void testJoinTableWithoutPagination() {
-        List<H2Addr> addrList = userMapper.getAddrListByUserId(101L);
-        Assert.assertEquals(5, addrList.size());
-    }
-
-    @Test
-    public void testJoinTableWithPagination() {
-        this.testOptimizeCountSqlPagination(false);
-        this.testOptimizeCountSqlPagination(true);
-    }
-
-    private void testOptimizeCountSqlPagination(boolean optimizeCountSql) {
-        Page<H2Addr> page = new Page<H2Addr>(0, 3);
-        page.setOptimizeCountSql(optimizeCountSql);
-        List<H2Addr> addrList = userMapper.getAddrListByUserIdPage(101L, page);
-        Assert.assertNotEquals("Should have pagination info", 0, page.getTotal());
-        Assert.assertEquals(3, addrList.size());
-    }
-
-}

+ 0 - 61
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2PersonCamelTest.java

@@ -1,61 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Date;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2PersonCamelMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Person;
-
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2-mvc-camel.xml"})
-public class H2PersonCamelTest extends AbstractH2UserTest {
-
-    @Autowired
-    H2PersonCamelMapper personCamelMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2-mvc-camel.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn, "person.ddl.sql", "person.insert.sql", "h2person");
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        H2Person person = new H2Person();
-        person.setName("person");
-        person.setTestType(1);
-        person.setLastUpdatedDt(new Date());
-        Assert.assertEquals(1, personCamelMapper.insert(person).intValue());
-        Long id = person.getId();
-        Assert.assertNotNull(personCamelMapper.selectById(id));
-    }
-
-}

+ 0 - 109
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2SqlRunnerTest.java

@@ -1,109 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2SqlRunnerTest extends H2Test {
-
-    @Autowired
-    private IH2UserService userService;
-
-    @Autowired
-    H2UserMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testSelect() {
-        List<Map<String, Object>> list = SqlRunner.db().selectList("select * from h2user where test_type={0}", 1);
-        for (Map<String, Object> map : list) {
-            System.out.println(JSONObject.toJSON(map));
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        SqlRunner.db().insert("insert into h2user(name,age,test_type,test_date,version) values ({0},{1},{2},{3},{4})",
-            "Kshen", 19, 1, null, 1);
-        Object obj = SqlRunner.db().selectObj("select name,test_id from h2user where name={0}", "Kshen");
-        Assert.assertNotNull(obj);
-        Assert.assertEquals("only return first column's value", "Kshen", obj);
-        System.out.println(obj);
-    }
-
-    @Test
-    public void testUpdate() {
-        List<Map<String, Object>> list = SqlRunner.db().selectList("select * from h2user where test_type={0}", 1);
-        Map<String, Object> user1 = list.get(0);
-        System.out.println(JSONObject.toJSON(user1));
-        Long testId = (Long) user1.get("TEST_ID");
-        String name = (String) user1.get("NAME");
-        Assert.assertNotNull(testId);
-        Assert.assertNotNull(name);
-        SqlRunner.db().update("update h2user set name={0} where test_id={1}", "Kshen", testId);
-        list = SqlRunner.db().selectList("select * from h2user where test_id={0}", testId);
-        user1 = list.get(0);
-        System.out.println(JSONObject.toJSON(user1));
-        Assert.assertNotEquals("name should be updated", name, user1.get("NAME"));
-    }
-
-    @Test
-    public void testDelete() {
-        List<Map<String, Object>> list = SqlRunner.db().selectList("select * from h2user where test_type={0}", 1);
-        Map<String, Object> user1 = list.get(0);
-        System.out.println(JSONObject.toJSON(user1));
-        Long testId = (Long) user1.get("TEST_ID");
-        SqlRunner.db().delete("delete from h2user where test_id={0}", testId);
-        list = SqlRunner.db().selectList("select * from h2user where test_id={0}", testId);
-        Assert.assertTrue("this record should be deleted", list == null || list.isEmpty());
-    }
-
-    @Test
-    public void testSelectObjs() {
-        List<Object> list = SqlRunner.db().selectObjs("select name,test_id from h2user");
-        Assert.assertTrue("only return first column value", list.get(0) instanceof String);
-
-        list = SqlRunner.db().selectObjs("select test_id,name from h2user");
-        Assert.assertTrue("only return first column value", list.get(0) instanceof Long);
-    }
-
-}

+ 0 - 75
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAddrJoinTest.java

@@ -1,75 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserAddrJoinTest extends H2Test {
-
-    @Autowired
-    private H2UserMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            Statement stmt = conn.createStatement();
-            stmt.execute(readFile("user.ddl.sql"));
-            stmt.execute("truncate table h2user");
-            stmt.execute(readFile("addr.ddl.sql"));
-            stmt.execute("truncate table h2address");
-            executeSql(stmt, "user.insert.sql");
-            executeSql(stmt, "addr.insert.sql");
-            conn.commit();
-        }
-    }
-
-    @Test
-    public void testJoinTableWithoutPagination() {
-        List<H2Addr> addrList = userMapper.getAddrListByUserId(101L);
-        Assert.assertEquals(5, addrList.size());
-    }
-
-    @Test
-    public void testJoinTableWithPagination() {
-        Page<H2Addr> page = new Page<H2Addr>(0, 3);
-        List<H2Addr> addrList = userMapper.getAddrListByUserIdPage(101L, page);
-        Assert.assertNotEquals("Should have pagination info", 0, page.getTotal());
-        Assert.assertEquals(3, addrList.size());
-    }
-
-}

+ 0 - 105
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserAutoincrementTest.java

@@ -1,105 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserAutoincrementTest extends H2Test {
-
-    @Autowired
-    private H2UserMetaobjMapper userMapper;
-
-    @Autowired
-    IH2UserMetaobjService userService;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        H2UserMetaObj user = new H2UserMetaObj();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        Assert.assertEquals(1, userMapper.insert(user).intValue());
-        Long id1 = user.getId();
-        Assert.assertNotNull(id1);
-        user.setDesc("Caratacus");
-        Assert.assertEquals(1, userMapper.updateById(user).intValue());
-        H2UserMetaObj userFromDB = userMapper.selectById(id1);
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-
-        H2UserMetaObj user2 = new H2UserMetaObj();
-        user2.setAge(2);
-        Assert.assertEquals(1, userMapper.insert(user2).intValue());
-        Assert.assertNotNull(user2.getId());
-    }
-
-
-    @Test
-    public void testInsertMy() {
-        String name = "testInsertMy";
-        int version = 1;
-        int row = userMapper.myInsertWithNameVersion(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        H2UserMetaObj user = new H2UserMetaObj();
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userMapper.insert(user);
-        Long id = user.getId();
-        H2UserMetaObj dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userMapper.myUpdateWithNameId(id, "updateMy"));
-
-        dbUser = userMapper.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals(1, user.getVersion().intValue());
-
-    }
-
-}

+ 0 - 179
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserDateVersionTest.java

@@ -1,179 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserDateVersionMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserDateVersionMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserDateVersionTest extends H2Test {
-
-    @Autowired
-    private H2UserDateVersionMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-
-    @Test
-    public void testUpdateByIdNoDateVersion() {
-        Long id = 991L;
-        H2UserDateVersion user = new H2UserDateVersion();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userMapper.insertAllColumn(user);
-
-        H2UserDateVersion userDB = userMapper.selectById(id);
-        Assert.assertEquals(null, userDB.getTestDate());
-
-        userDB.setName("991");
-        userMapper.updateById(userDB);
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("991", userDB.getName());
-        Assert.assertEquals(null, userDB.getTestDate());
-    }
-
-
-    @Test
-    public void testUpdateByEntityWrapperNoDateVersion() {
-        Long id = 992L;
-        H2UserDateVersion user = new H2UserDateVersion();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userMapper.insertAllColumn(user);
-
-        H2UserDateVersion userDB = userMapper.selectById(id);
-
-        H2UserDateVersion updUser = new H2UserDateVersion();
-        updUser.setName("999");
-
-        userMapper.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByIdWithDateVersion() {
-        Long id = 994L;
-        H2UserDateVersion user = new H2UserDateVersion();
-        user.setId(id);
-        user.setName("994");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        user.setTestDate(cal.getTime());
-        userMapper.insertAllColumn(user);
-
-        System.out.println("before update: testDate=" + user.getTestDate());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
-        H2UserDateVersion userDB = userMapper.selectById(id);
-
-        Assert.assertNotNull(userDB.getTestDate());
-        String originalDateVersionStr = sdf.format(cal.getTime());
-        Assert.assertEquals(originalDateVersionStr, sdf.format(userDB.getTestDate()));
-
-        userDB.setName("991");
-        userMapper.updateById(userDB);
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("991", userDB.getName());
-        Date versionDate = userDB.getTestDate();
-        System.out.println("after update: testDate=" + versionDate);
-        String versionDateStr = sdf.format(versionDate);
-        Assert.assertEquals("@version field testDate should be updated to current sysdate", sdf.format(new Date()), versionDateStr);
-
-        Assert.assertNotEquals("@version field testDate should be updated to current sysdate", originalDateVersionStr, versionDateStr);
-
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperWithDateVersion() {
-        Long id = 993L;
-        H2UserDateVersion user = new H2UserDateVersion();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1);
-        user.setTestDate(cal.getTime());
-        userMapper.insertAllColumn(user);
-
-        H2UserDateVersion userDB = userMapper.selectById(id);
-
-        H2UserDateVersion updUser = new H2UserDateVersion();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userMapper.update(updUser, new EntityWrapper<>(userDB));
-
-        System.out.println("before update: testDate=" + userDB.getTestDate());
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
-
-        userDB = userMapper.selectById(id);
-        Assert.assertEquals("999", userDB.getName());
-
-        Date versionDate = userDB.getTestDate();
-        System.out.println("after update: testDate=" + versionDate);
-        String versionDateStr = sdf.format(versionDate);
-        Assert.assertEquals("@version field testDate should be updated to current sysdate", sdf.format(new Date()), versionDateStr);
-    }
-
-
-}

+ 0 - 311
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserExtendsTest.java

@@ -1,311 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.ServiceConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
-
-/**
- * <p>
- * #328 实体继承属性测试
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {ServiceConfig.class})
-public class H2UserExtendsTest extends H2Test {
-
-    @Autowired
-    IH2UserExtendsService userService;
-
-    @BeforeClass
-    public static void init() throws SQLException, IOException {
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(ServiceConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Assert.assertNotNull(user.getId());
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        H2UserIntVersionExtendTO userFromDB = userService.selectById(user.getId());
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-    }
-
-    @Test
-    public void testUpdate() {
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Long id = user.getId();
-        Assert.assertNotNull(id);
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        H2UserIntVersionExtendTO userFromDB = userService.selectById(id);
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-
-        user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setDesc("Caratacus2");
-        userService.updateById(user);
-        userFromDB = userService.selectById(id);
-        Assert.assertEquals("Caratacus2", userFromDB.getDesc());
-        Assert.assertEquals(new BigDecimal("9.99"), userFromDB.getPrice());
-    }
-
-
-    @Test
-    public void testDelete() {
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.91"));
-        userService.insert(user);
-        Long userId = user.getId();
-        Assert.assertNotNull(userId);
-        Assert.assertNotNull(userService.selectById(userId));
-        userService.deleteById(userId);
-        Assert.assertNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectPage() {
-        Page<H2UserIntVersionExtendTO> page = userService.selectPage(new Page<H2UserIntVersionExtendTO>(1, 3));
-        Assert.assertEquals(3, page.getRecords().size());
-    }
-
-    @Test
-    public void testUpdateByIdOptLock() {
-        Long id = 991L;
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserIntVersionExtendTO userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("992");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("992", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLock() {
-        Long id = 992L;
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserIntVersionExtendTO userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2UserIntVersionExtendTO updUser = new H2UserIntVersionExtendTO();
-        updUser.setName("999");
-
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-
-    @Test
-    public void testUpdateByEntityWrapperOptLockWithoutVersionVal() {
-        Long id = 993L;
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserIntVersionExtendTO userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2UserIntVersionExtendTO updUser = new H2UserIntVersionExtendTO();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNoEntity() {
-        Long id = 998L;
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserIntVersionExtendTO userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        H2UserIntVersionExtendTO updateUser = new H2UserIntVersionExtendTO();
-        updateUser.setName("998");
-        boolean result = userService.update(updateUser, new EntityWrapper<H2UserIntVersionExtendTO>());
-        Assert.assertTrue(result);
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        EntityWrapper<H2UserIntVersionExtendTO> param = new EntityWrapper<>();
-        param.eq("name", "998");
-        List<H2UserIntVersionExtendTO> userList = userService.selectList(param);
-        Assert.assertTrue(userList.size() > 1);
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNull() {
-        Long id = 918L;
-        H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserIntVersionExtendTO userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        H2UserIntVersionExtendTO updateUser = new H2UserIntVersionExtendTO();
-        updateUser.setName("918");
-        updateUser.setVersion(1);
-        Assert.assertTrue(userService.update(updateUser, null));
-        EntityWrapper<H2UserIntVersionExtendTO> ew = new EntityWrapper<>();
-        int count1 = userService.selectCount(ew);
-        ew.eq("name", "918").eq("version", 1);
-        int count2 = userService.selectCount(ew);
-        List<H2UserIntVersionExtendTO> userList = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        for (H2UserIntVersionExtendTO u : userList) {
-            System.out.println(u);
-        }
-        System.out.println("count1=" + count1 + ", count2=" + count2);
-        Assert.assertTrue(count2 > 0);
-        Assert.assertEquals(count1, count2);
-    }
-
-    @Test
-    public void testUpdateBatch() {
-        List<H2UserIntVersionExtendTO> list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        Map<Long, Integer> userVersionMap = new HashMap<>();
-        for (H2UserIntVersionExtendTO u : list) {
-            userVersionMap.put(u.getId(), u.getVersion());
-        }
-
-        Assert.assertTrue(userService.updateBatchById(list));
-        list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        for (H2UserIntVersionExtendTO user : list) {
-            Assert.assertEquals(userVersionMap.get(user.getId()) + 1, user.getVersion().intValue());
-        }
-
-    }
-
-    @Test
-    public void testUpdateInLoop() {
-        List<H2UserIntVersionExtendTO> list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2UserIntVersionExtendTO h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        for (H2UserIntVersionExtendTO u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            if (u.getVersion() != null)
-                Assert.assertEquals(versionBefore.get(u.getId()) + 1, u.getVersion().intValue());
-        }
-    }
-
-    @Test
-    public void testUpdateAllColumnInLoop() {
-        List<H2UserIntVersionExtendTO> list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2UserIntVersionExtendTO h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateAllColumnById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2UserIntVersionExtendTO>());
-        for (H2UserIntVersionExtendTO u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            Assert.assertEquals(versionBefore.get(u.getId()) + 1, u.getVersion().intValue());
-        }
-    }
-}

+ 0 - 310
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoOptLockTest.java

@@ -1,310 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-no-opt-lock-h2.xml"})
-public class H2UserNoOptLockTest extends H2Test {
-
-    @Autowired
-    private IH2UserService userService;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        H2User user = new H2User();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Assert.assertNotNull(user.getId());
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        H2User userFromDB = userService.selectById(user.getId());
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-    }
-
-    @Test
-    public void testDelete() {
-        H2User user = new H2User();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Long userId = user.getId();
-        Assert.assertNotNull(userId);
-        userService.deleteById(userId);
-        Assert.assertNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectByid() {
-        Long userId = 101L;
-        Assert.assertNotNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectOne() {
-        H2User user = new H2User();
-        user.setId(105L);
-        EntityWrapper<H2User> ew = new EntityWrapper<>(user);
-        H2User userFromDB = userService.selectOne(ew);
-        Assert.assertNotNull(userFromDB);
-    }
-
-    @Test
-    public void testSelectList() {
-        H2User user = new H2User();
-        EntityWrapper<H2User> ew = new EntityWrapper<>(user);
-        List<H2User> list = userService.selectList(ew);
-        Assert.assertNotNull(list);
-        Assert.assertNotEquals(0, list.size());
-    }
-
-    @Test
-    public void testSelectPage() {
-        Page<H2User> page = userService.selectPage(new Page<H2User>(1, 3));
-        Assert.assertEquals(3, page.getRecords().size());
-    }
-
-    @Test
-    public void testUpdateByIdOptLock() {
-        Long id = 991L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("991");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("991", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateAllColumnByIdOptLock() {
-        Long id = 997L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("991");
-        userService.updateAllColumnById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("991", userDB.getName());
-
-        userDB.setName("990");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("990", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLock() {
-        Long id = 992L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2User updUser = new H2User();
-        updUser.setName("999");
-
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLockWithoutVersion() {
-        Long id = 993L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2User updUser = new H2User();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateBatch() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> userVersionMap = new HashMap<>();
-        for (H2User u : list) {
-            userVersionMap.put(u.getId(), u.getVersion());
-        }
-
-        Assert.assertTrue(userService.updateBatchById(list));
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User user : list) {
-            Assert.assertEquals(userVersionMap.get(user.getId()).intValue(), user.getVersion().intValue());
-        }
-
-    }
-
-    @Test
-    public void testUpdateInLoop() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2User h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            Assert.assertEquals(versionBefore.get(u.getId()).intValue(), u.getVersion().intValue());
-        }
-    }
-
-    @Test
-    public void testUpdateAllColumnInLoop() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2User h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateAllColumnById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            Assert.assertEquals(versionBefore.get(u.getId()).intValue(), u.getVersion().intValue());
-        }
-    }
-
-
-    @Test
-    public void testInsertMy() {
-        String name = "testInsertMy";
-        int version = 1;
-        int row = userService.myInsert(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        Long id = 10087L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userService.insert(user);
-
-        H2User dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userService.myUpdate(id, "updateMy"));
-
-        dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals(1, user.getVersion().intValue());
-
-    }
-}

+ 0 - 238
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserNoVersionTest.java

@@ -1,238 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserNoVersionTest extends H2Test {
-
-    @Autowired
-    IH2UserNoVersionService userService;
-
-    @Autowired
-    H2UserNoVersionMapper userMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Assert.assertNotNull(user.getId());
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        H2UserNoVersion userFromDB = userService.selectById(user.getId());
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-    }
-
-    @Test
-    public void testDelete() {
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Long userId = user.getId();
-        Assert.assertNotNull(userId);
-        userService.deleteById(userId);
-        Assert.assertNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectByid() {
-        Long userId = 101L;
-        Assert.assertNotNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectOne() {
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setId(105L);
-        EntityWrapper<H2UserNoVersion> ew = new EntityWrapper<>(user);
-        H2UserNoVersion userFromDB = userService.selectOne(ew);
-        Assert.assertNotNull(userFromDB);
-    }
-
-    @Test
-    public void testSelectList() {
-        H2UserNoVersion user = new H2UserNoVersion();
-        EntityWrapper<H2UserNoVersion> ew = new EntityWrapper<>(user);
-        List<H2UserNoVersion> list = userService.selectList(ew);
-        Assert.assertNotNull(list);
-        Assert.assertNotEquals(0, list.size());
-    }
-
-    @Test
-    public void testSelectPage() {
-        Page<H2UserNoVersion> page = userService.selectPage(new Page<H2UserNoVersion>(1, 3));
-        Assert.assertEquals(3, page.getRecords().size());
-    }
-
-    @Test
-    public void testUpdateById() {
-        Long id = 991L;
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserNoVersion userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("991");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("991", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapper() {
-        Long id = 992L;
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserNoVersion userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2UserNoVersion updUser = new H2UserNoVersion();
-        updUser.setName("999");
-
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateByEntityWrapper2() {
-        Long id = 993L;
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2UserNoVersion userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2UserNoVersion updUser = new H2UserNoVersion();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    @Test
-    public void testUpdateBatch() {
-        List<H2UserNoVersion> list = userService.selectList(new EntityWrapper<H2UserNoVersion>());
-        Map<Long, Integer> userVersionMap = new HashMap<>();
-        for (H2UserNoVersion u : list) {
-            userVersionMap.put(u.getId(), u.getVersion());
-        }
-        userService.updateBatchById(list);
-
-        list = userService.selectList(new EntityWrapper<H2UserNoVersion>());
-        for (H2UserNoVersion user : list) {
-            Assert.assertEquals(userVersionMap.get(user.getId()).intValue(), user.getVersion().intValue());
-        }
-    }
-
-
-    @Test
-    public void testInsertMy() {
-        String name = "testInsertMy";
-        int version = 1;
-        int row = userMapper.myInsertWithNameVersion(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        Long id = 10087L;
-        H2UserNoVersion user = new H2UserNoVersion();
-        user.setId(id);
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userService.insert(user);
-
-        H2UserNoVersion dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userMapper.myUpdateWithNameId(id, "updateMy"));
-
-        dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals(1, user.getVersion().intValue());
-
-    }
-}

+ 0 - 255
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserTest.java

@@ -1,255 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.metadata.Column;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserTest extends AbstractH2UserTest {
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Test
-    public void testInsert() {
-        insertSimpleCase();
-    }
-
-    @Test
-    public void testInsertBatch() {
-        insertBatchSimpleCase();
-    }
-
-    @Test
-    public void testDelete() {
-        deleteSimpleCase();
-    }
-
-    @Test
-    public void testSelectByid() {
-        Long userId = 101L;
-        Assert.assertNotNull(userService.selectById(userId));
-    }
-
-    @Test
-    public void testSelectOne() {
-        selectOneSimpleCase();
-    }
-
-    @Test
-    public void testSelectList() {
-        selectListSimpleCase();
-    }
-
-    @Test
-    public void testSelectPage() {
-        selectPageSimpleCase();
-    }
-
-    @Test
-    public void testPageHelper() {
-        selectPageHelperCase();
-    }
-
-    @Test
-    public void testUpdateByIdOptLock() {
-        updateByIdWithOptLock();
-    }
-
-    @Test
-    public void testUpdateAllColumnByIdOptLock() {
-        updateAllColumnByIdCase();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLock() {
-        updateByEntityWrapperOptLock();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperOptLockWithoutVersionVal() {
-        updateByEntityWrapperOptLockWithoutVersionVal();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNoEntity() {
-        updateByEntityWrapperNoEntity();
-    }
-
-    @Test
-    public void testUpdateByEntityWrapperNull() {
-        updateByEntityWrapperNull();
-    }
-
-    @Test
-    public void testUpdateBatch() {
-        updateBatchSimpleCase();
-    }
-
-    @Test
-    public void testUpdateInLoop() {
-        updateInLoopCase();
-    }
-
-    @Test
-    public void testUpdateAllColumnInLoop() {
-        updateAllColumnInLoop();
-    }
-
-    @Test
-    public void testInsertMy() {
-        String name = "自定义insert";
-        int version = 1;
-        int row = userService.myInsert(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        int row = userService.myInsertWithParam(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testInsertObjectWithoutParam() {
-        String name = "自定义insert带Param注解";
-        int version = 1;
-        int row = userService.myInsertWithoutParam(name, version);
-        Assert.assertEquals(1, row);
-    }
-
-    @Test
-    public void testUpdateMy() {
-        updateByMySql();
-    }
-
-
-    @Test
-    public void testConditionInPage() {
-        selectWithPageCondition();
-    }
-
-
-    @Test
-    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) {
-            Assert.assertNotNull(u.getId());
-            Assert.assertNotNull(u.getName());
-            Assert.assertNull(u.getPrice());
-        }
-
-    }
-
-    @Test
-    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) {
-            Assert.assertEquals(nameParam, u.getName());
-            Assert.assertNotNull(u.getId());
-        }
-    }
-
-    @Test
-    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));
-        Assert.assertNotNull(page.getRecords());
-        for (H2User u : page.getRecords()) {
-            Assert.assertEquals(nameParam, u.getName());
-            Assert.assertNotNull(u.getId());
-        }
-        Assert.assertNotEquals(0, page.getTotal());
-    }
-
-    @Test
-    public void testSelectCountWithParamInSelectItems() {
-        Map<String, Object> param = new HashMap<>();
-        String nameParam = "selectStmtParam";
-        param.put("nameParam", nameParam);
-        param.put("ageFrom", 1);
-        param.put("ageTo", 100);
-        int count = userService.selectCountWithParamInSelectItems(param);
-        Assert.assertNotEquals(0, count);
-    }
-
-    @Test
-    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);
-        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());
-        }
-    }
-
-}

+ 0 - 100
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2UserVersionIntWithARTest.java

@@ -1,100 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Date;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.AbstractH2UserTest;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDeleteWithAR;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionIntWithAR;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserVersionIntWithARService;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserVersionIntWithARTest extends AbstractH2UserTest {
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Autowired
-    IH2UserVersionIntWithARService arService;
-
-    @Autowired
-    private IH2UserLogicDeleteService logicDeleteService;
-
-    @Test
-    public void testOptLock4AR() {
-        H2UserVersionIntWithAR user = new H2UserVersionIntWithAR();
-        user.setName("ARTest").setAge(18).setPrice(BigDecimal.TEN).setTestDate(new Date()).setVersion(1);
-        user.insert();
-        Long id = user.getId();
-        H2UserVersionIntWithAR userDB = user.selectById(id);
-        Assert.assertNotNull("should insert success", userDB);
-        Assert.assertNotNull("autofill should work when do insert", userDB.getTestType());
-        Assert.assertNull("lastUpdateDt should be null", userDB.getLastUpdatedDt());
-
-        Assert.assertEquals("init version=1", 1, userDB.getVersion().intValue());
-        String updateName = "ARTestUpdate";
-        user.setName(updateName).updateById();
-
-        userDB = user.selectById(id);
-        Assert.assertNotNull(userDB);
-        Assert.assertEquals("version should updated", 2, userDB.getVersion().intValue());
-        Assert.assertNotNull("autofill should work when do update", userDB.getLastUpdatedDt());
-    }
-
-
-    @Test
-    public void testLogicDelete() {
-        H2UserLogicDeleteWithAR user = new H2UserLogicDeleteWithAR();
-        user.setName("ARLogicDelete").setAge(1).setVersion(1).setTestDate(new Date()).insert();
-        Long id = user.getId();
-        user = user.selectById(id);
-        Assert.assertNotNull("should have record for id=" + id, user);
-        /**
-         * 测试service的逻辑删除
-         */
-        logicDeleteService.deleteById(id);
-        Assert.assertNull("should logic deleted", logicDeleteService.selectById(id));
-        Assert.assertNotNull("should logic deleted, not real delete", arService.selectByIdWithoutLogicDeleteLimit(id));
-        arService.updateLogicDeletedRecord(id);
-        /**
-         * 测试AR的逻辑删除
-         */
-        user.deleteById();
-        Assert.assertNull("should be logic deleted for id=" + id, user.selectById(id));
-        Assert.assertNotNull("record is logic deleted, should not null", arService.selectByIdWithoutLogicDeleteLimit(id));
-        arService.updateLogicDeletedRecord(id);
-    }
-
-}

+ 0 - 62
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/H2uuidTest.java

@@ -1,62 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.sql.DataSource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2uuidMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2uuidMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2uuidTest extends H2Test {
-
-    @Autowired
-    private H2uuidMapper uuidMapper;
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:h2/spring-test-h2.xml");
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            Statement stmt = conn.createStatement();
-            stmt.execute(readFile("uuid.sql"));
-            stmt.execute("truncate table h2uuid");
-            conn.commit();
-        }
-    }
-
-    @Test
-    public void testUuid() {
-        H2uuid h2uuid = new H2uuid("3");
-        Assert.assertEquals(1, uuidMapper.insert(h2uuid).intValue());
-        Assert.assertTrue(h2uuid.getId().length() == 32);
-    }
-
-}

+ 0 - 364
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/AbstractH2UserTest.java

@@ -1,364 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.base;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import org.junit.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.core.pagination.PageHelper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserService;
-
-/**
- * <p>
- * test cases for {@link H2User}
- * </p>
- *
- * @author yuxiaobin
- * @date 2018/1/5
- */
-public abstract class AbstractH2UserTest extends H2Test {
-
-    @Autowired
-    protected IH2UserService userService;
-
-    @Autowired
-    protected H2UserMapper userMapper;
-
-    protected void insertSimpleCase() {
-        H2User user = new H2User();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Assert.assertNotNull(user.getId());
-        user.setDesc("Caratacus");
-        userService.insertOrUpdate(user);
-        H2User userFromDB = userService.selectById(user.getId());
-        Assert.assertEquals("Caratacus", userFromDB.getDesc());
-    }
-
-    protected void insertBatchSimpleCase() {
-        userService.insert(new H2User("sanmao", 1));
-        List<H2User> h2Users = new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            H2User user = new H2User();
-            user.setAge(1);
-            user.setPrice(new BigDecimal("6" + i));
-            user.setDesc("testBatch" + i);
-            h2Users.add(user);
-        }
-        Assert.assertTrue(userService.insertBatch(h2Users));
-    }
-
-    protected void deleteSimpleCase() {
-        H2User user = new H2User();
-        user.setAge(1);
-        user.setPrice(new BigDecimal("9.99"));
-        userService.insert(user);
-        Long userId = user.getId();
-        Assert.assertNotNull(userId);
-        userService.deleteById(userId);
-        Assert.assertNull(userService.selectById(userId));
-    }
-
-    protected void selectOneSimpleCase() {
-        H2User user = new H2User();
-        user.setId(105L);
-        EntityWrapper<H2User> ew = new EntityWrapper<>(user);
-        H2User userFromDB = userService.selectOne(ew);
-        Assert.assertNotNull(userFromDB);
-    }
-
-    protected void selectListSimpleCase() {
-        H2User user = new H2User();
-        EntityWrapper<H2User> ew = new EntityWrapper<>(user);
-        List<H2User> list = userService.selectList(ew);
-        Assert.assertNotNull(list);
-        Assert.assertNotEquals(0, list.size());
-    }
-
-    protected void selectPageSimpleCase() {
-        int size = 3;
-        Page<H2User> page = userService.selectPage(new Page<H2User>(1, size));
-        Assert.assertEquals(size, page.getRecords().size());
-        int total = page.getTotal();
-        page = userService.selectPage(new Page<H2User>(2, size));
-        if (total >= size * 2) {
-            Assert.assertEquals(size, page.getRecords().size());
-        } else {
-            Assert.assertEquals(total - size, page.getRecords().size());
-        }
-    }
-
-    protected void selectPageHelperCase() {
-        PageHelper.startPage(1, 3);
-        List<H2User> userList = userService.selectList(new EntityWrapper<H2User>());
-        System.out.println("total=" + PageHelper.freeTotal());
-        Assert.assertEquals("Should do pagination", 3, userList.size());
-        userList = userService.selectList(new EntityWrapper<H2User>());
-        Assert.assertNotEquals("Should not do pagination", 3, userList.size());
-    }
-
-    protected void updateByIdWithOptLock() {
-        Long id = 991L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("991");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("991", userDB.getName());
-    }
-
-    protected void updateAllColumnByIdCase() {
-        Long id = 997L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("991");
-        user.setAge(91);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        userDB.setName("991");
-        userService.updateAllColumnById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("991", userDB.getName());
-
-        userDB.setName("990");
-        userService.updateById(userDB);
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(3, userDB.getVersion().intValue());
-        Assert.assertEquals("990", userDB.getName());
-    }
-
-    protected void updateByEntityWrapperOptLock() {
-        Long id = 1992L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2User updUser = new H2User();
-        updUser.setName("999");
-
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    protected void updateByEntityWrapperOptLockWithoutVersionVal() {
-        Long id = 993L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-
-        H2User updUser = new H2User();
-        updUser.setName("999");
-        userDB.setVersion(null);
-        userService.update(updUser, new EntityWrapper<>(userDB));
-
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        Assert.assertEquals("999", userDB.getName());
-    }
-
-    protected void updateByEntityWrapperNoEntity() {
-        Long id = 998L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        H2User updateUser = new H2User();
-        updateUser.setName("998");
-        boolean result = userService.update(updateUser, new EntityWrapper<H2User>());
-        Assert.assertTrue(result);
-        userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        EntityWrapper<H2User> param = new EntityWrapper<>();
-        param.eq("name", "998");
-        List<H2User> userList = userService.selectList(param);
-        Assert.assertTrue(userList.size() > 1);
-    }
-
-    protected void updateByEntityWrapperNull() {
-        Long id = 918L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("992");
-        user.setAge(92);
-        user.setPrice(BigDecimal.TEN);
-        user.setDesc("asdf");
-        user.setTestType(1);
-        user.setVersion(1);
-        userService.insertAllColumn(user);
-
-        H2User userDB = userService.selectById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
-        H2User updateUser = new H2User();
-        updateUser.setName("918");
-        updateUser.setVersion(1);
-        Assert.assertTrue(userService.update(updateUser, null));
-        EntityWrapper<H2User> ew = new EntityWrapper<>();
-        int count1 = userService.selectCount(ew);
-        ew.eq("name", "918").eq("version", 1);
-        int count2 = userService.selectCount(ew);
-        List<H2User> userList = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : userList) {
-            System.out.println(u);
-        }
-        System.out.println("count1=" + count1 + ", count2=" + count2);
-        Assert.assertTrue(count2 > 0);
-        Assert.assertEquals(count1, count2);
-    }
-
-    protected void updateBatchSimpleCase() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> userVersionMap = new HashMap<>();
-        for (H2User u : list) {
-            userVersionMap.put(u.getId(), u.getVersion());
-        }
-
-        Assert.assertTrue(userService.updateBatchById(list));
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User user : list) {
-            Assert.assertEquals(userVersionMap.get(user.getId()) + 1, user.getVersion().intValue());
-        }
-    }
-
-    protected void updateInLoopCase() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2User h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            if (u.getVersion() != null)
-                Assert.assertEquals(versionBefore.get(u.getId()) + 1, u.getVersion().intValue());
-        }
-    }
-
-    protected void updateAllColumnInLoop() {
-        List<H2User> list = userService.selectList(new EntityWrapper<H2User>());
-        Map<Long, Integer> versionBefore = new HashMap<>();
-        Map<Long, String> nameExpect = new HashMap<>();
-        for (H2User h2User : list) {
-            Long id = h2User.getId();
-            Integer versionVal = h2User.getVersion();
-            versionBefore.put(id, versionVal);
-            String randomName = h2User.getName() + "_" + new Random().nextInt(10);
-            nameExpect.put(id, randomName);
-            h2User.setName(randomName);
-            userService.updateAllColumnById(h2User);
-        }
-
-        list = userService.selectList(new EntityWrapper<H2User>());
-        for (H2User u : list) {
-            Assert.assertEquals(u.getName(), nameExpect.get(u.getId()));
-            Assert.assertEquals(versionBefore.get(u.getId()) + 1, u.getVersion().intValue());
-        }
-    }
-
-    protected void updateByMySql() {
-        Long id = 10087L;
-        H2User user = new H2User();
-        user.setId(id);
-        user.setName("myUpdate");
-        user.setVersion(1);
-        userService.insert(user);
-
-        H2User dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("myUpdate", dbUser.getName());
-
-        Assert.assertEquals(1, userService.myUpdate(id, "updateMy"));
-
-        dbUser = userService.selectById(id);
-        Assert.assertNotNull(dbUser);
-        Assert.assertEquals("updateMy", dbUser.getName());
-        Assert.assertEquals(1, user.getVersion().intValue());
-    }
-
-    protected void selectWithPageCondition() {
-        H2User user = new H2User();
-        user.setName("pageCondition");
-        user.setTestType(99);
-        user.setVersion(1);
-        userService.insert(user);
-        Page<H2User> page = new Page<>(1, 3);
-        Map<String, Object> condition = new HashMap<>();
-        condition.put("test_type", 99);
-        page.setCondition(condition);
-        Page<H2User> pageResult = userService.selectPage(page);
-        Assert.assertEquals("testType=99 should only have 1 record", 1, pageResult.getTotal());
-        for (H2User u : pageResult.getRecords()) {
-            System.out.println(u);
-        }
-        System.out.println(pageResult.getTotal());
-    }
-}

+ 0 - 79
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/base/H2Test.java

@@ -1,79 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.base;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Assert;
-
-import com.baomidou.mybatisplus.extension.test.h2.H2UserNoOptLockTest;
-
-/**
- * <p>
- * Mybatis Plus H2 Junit Test
- * </p>
- *
- * @author hubin
- * @since 2017-06-15
- */
-public class H2Test {
-
-    public static void executeSql(Statement stmt, String sqlFilename) throws SQLException, IOException {
-        String filePath = H2Test.class.getResource("/h2/" + sqlFilename).getPath();
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    public static void initData(Connection conn) throws SQLException, IOException {
-//        String createTableSql = readFile("user.ddl.sql");
-//        Statement stmt = conn.createStatement();
-//        stmt.execute(createTableSql);
-//        stmt.execute("truncate table h2user");
-//        executeSql(stmt, "user.insert.sql");
-//        conn.commit();
-        initData(conn, "user.ddl.sql", "user.insert.sql", "h2user");
-    }
-
-    public static void initData(Connection conn, String ddlFileName, String insertFileName, String tableName) throws SQLException, IOException {
-        String createTableSql = readFile(ddlFileName);
-        Statement stmt = conn.createStatement();
-        stmt.execute(createTableSql);
-        stmt.execute("truncate table " + tableName);
-        executeSql(stmt, insertFileName);
-        conn.commit();
-    }
-
-    public static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserNoOptLockTest.class.getResource("/h2/" + filename).getPath();
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
-    protected void assertUpdateFill(Date lastUpdatedDt) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
-        System.out.println("after update: testDate=" + lastUpdatedDt);
-        String versionDateStr = sdf.format(lastUpdatedDt);
-        //MyMetaObjectHandler.updateFill() : set lastUpdatedDt=currentTimestamp
-        Assert.assertEquals("lastUpdateDt will be updated by H2MetaObjectHandler.updateFill()", sdf.format(new Date()), versionDateStr);//before update: lastUpdatedDt=currentTimestamp-1day
-    }
-}

+ 0 - 46
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpH2Config.java

@@ -1,46 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.h2.Driver;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-/**
- * <p>
- * H2 Memory Database config
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@Configuration
-@EnableTransactionManagement
-public class DBHikaricpH2Config {
-
-    @Bean
-    public DataSource dataSource() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setDriverClassName(Driver.class.getName());
-        hikariConfig.setUsername("sa");
-        hikariConfig.setPassword("");
-        hikariConfig.setJdbcUrl("jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE");
-//        dataSource.setJdbcUrl();
-//        dataSource.setUsername("sa");
-//        dataSource.setPassword("");
-        return new HikariDataSource(hikariConfig);
-    }
-
-    @Bean
-    public DataSourceTransactionManager transactionManager(DataSource ds) {
-        return new DataSourceTransactionManager(ds);
-    }
-
-}

+ 0 - 45
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBHikaricpMysqlConfig.java

@@ -1,45 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-/**
- * <p>
- * MySql Memory Database config
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@Configuration
-@EnableTransactionManagement
-public class DBHikaricpMysqlConfig {
-
-    @Bean
-    public DataSource dataSource() throws SQLException {
-        HikariConfig hikariConfig = new HikariConfig();
-        hikariConfig.setDriverClassName("com.mysql.jdbc.Driver");
-        hikariConfig.setUsername("root");
-        hikariConfig.setPassword("");
-        hikariConfig.setJdbcUrl("jdbc:mysql://localhost:3306/mybatis-plus");
-//        dataSource.setJdbcUrl();
-//        dataSource.setUsername("sa");
-//        dataSource.setPassword("");
-        return new HikariDataSource(hikariConfig);
-    }
-
-    @Bean
-    public DataSourceTransactionManager transactionManager(DataSource ds) {
-        return new DataSourceTransactionManager(ds);
-    }
-
-}

+ 0 - 41
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/DBTomcatjdbcH2Config.java

@@ -1,41 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.apache.tomcat.jdbc.pool.PoolConfiguration;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * <p>
- * Tomcatjdbc数据源
- * </p>
- *
- * @author yuxiaobin
- * @date 2018/1/3
- */
-@Configuration
-@EnableTransactionManagement
-public class DBTomcatjdbcH2Config {
-
-
-    @Bean
-    public DataSource dataSource() throws SQLException {
-        PoolConfiguration configuration = new PoolProperties();
-        configuration.setUrl("jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE");
-        configuration.setUsername("sa");
-        configuration.setPassword("");
-        configuration.setDriverClassName(org.h2.Driver.class.getCanonicalName());
-        return new org.apache.tomcat.jdbc.pool.DataSource(configuration);
-    }
-
-    @Bean
-    public DataSourceTransactionManager transactionManager(DataSource ds) {
-        return new DataSourceTransactionManager(ds);
-    }
-}

+ 0 - 64
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisConfigMetaObjOptLockConfig.java

@@ -1,64 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
-import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
-
-/**
- * <p>
- * MetaObj
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/29
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
-public class MybatisConfigMetaObjOptLockConfig {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-            new PerformanceInterceptor(),
-            new OptimisticLockerInterceptor()
-        });
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig conf = new GlobalConfig(new LogicSqlInjector());
-        conf.setLogicDeleteValue("-1");
-        conf.setLogicNotDeleteValue("1");
-        conf.setIdType(2);
-        conf.setMetaObjectHandler(new H2MetaObjectHandler());
-        return conf;
-    }
-}

+ 0 - 71
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusConfigMapUnderline2Camel.java

@@ -1,71 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
-import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
-import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
-
-/**
- * <p>
- * Mybatis Plus Config
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
-@ComponentScan("com.baomidou.mybatisplus.extension.test.h2.service.impl")
-public class MybatisPlusConfigMapUnderline2Camel {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-//        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-//        org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        configuration.setMapUnderscoreToCamelCase(true);
-        //注册Map 下划线转驼峰
-        configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory());
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        OptimisticLockerInterceptor optLock = new OptimisticLockerInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-            optLock,
-            new PerformanceInterceptor()
-        });
-        globalConfiguration.setMetaObjectHandler(new H2MetaObjectHandler());
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig conf = new GlobalConfig(new LogicSqlInjector());
-        conf.setLogicDeleteValue("-1");
-        conf.setLogicNotDeleteValue("1");
-        conf.setIdType(2);
-        return conf;
-    }
-}

+ 0 - 64
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusLoginDeleteConfig.java

@@ -1,64 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
-import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-
-
-/**
- * <p>
- * 逻辑删除boot方式注入
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
-public class MybatisPlusLoginDeleteConfig {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        OptimisticLockerInterceptor optLock = new OptimisticLockerInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-            optLock,
-            new PerformanceInterceptor()
-        });
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig conf = new GlobalConfig(new LogicSqlInjector());
-        conf.setLogicDeleteValue("-1");
-        conf.setLogicNotDeleteValue("1");
-        conf.setIdType(2);
-        return conf;
-    }
-}

+ 0 - 59
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusMetaObjConfig.java

@@ -1,59 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.baomidou.mybatisplus.extension.test.h2.H2MetaObjectHandler;
-
-/**
- * <p>
- * Mybatis Plus Config without OptimisLock
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2")
-public class MybatisPlusMetaObjConfig {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-            new PerformanceInterceptor()
-        });
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig globalConfiguration = new GlobalConfig();
-        globalConfiguration.setIdType(2);
-        globalConfiguration.setMetaObjectHandler(new H2MetaObjectHandler());
-        return globalConfiguration;
-    }
-}

+ 0 - 56
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusNoOptLockConfig.java

@@ -1,56 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-
-
-/**
- * <p>
- * Mybatis Plus Config without OptimisLock
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
-public class MybatisPlusNoOptLockConfig {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-        });
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig globalConfiguration = new GlobalConfig();
-        globalConfiguration.setIdType(2);
-        return globalConfiguration;
-    }
-}

+ 0 - 65
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/MybatisPlusSequenceConfig.java

@@ -1,65 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import javax.sql.DataSource;
-
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ResourceLoader;
-
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
-import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-
-
-/**
- * <p>
- * H2 Sequence
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Configuration
-@MapperScan("com.baomidou.mybatisplus.extension.test.h2.entity.mapper")
-public class MybatisPlusSequenceConfig {
-
-    @Bean("mybatisSqlSession")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource, ResourceLoader resourceLoader, GlobalConfig globalConfiguration) throws Exception {
-        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
-        sqlSessionFactory.setDataSource(dataSource);
-//        sqlSessionFactory.setConfigLocation(resourceLoader.getResource("classpath:mybatis-config.xml"));
-        sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.extension.test.h2.entity.persistent");
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        configuration.setMapUnderscoreToCamelCase(true);
-        sqlSessionFactory.setConfiguration(configuration);
-        PaginationInterceptor pagination = new PaginationInterceptor();
-        sqlSessionFactory.setPlugins(new Interceptor[]{
-            pagination,
-            new OptimisticLockerInterceptor(),
-            new PerformanceInterceptor()
-        });
-        sqlSessionFactory.setGlobalConfig(globalConfiguration);
-        return sqlSessionFactory.getObject();
-    }
-
-    @Bean
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig conf = new GlobalConfig();
-        conf.getDbConfig().setIdType(2);
-//        conf.setDbType("h2");
-        conf.getDbConfig().setKeyGenerator(new H2KeyGenerator());
-//        conf.setDbColumnUnderline(true);
-        return conf;
-    }
-}

+ 0 - 20
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceConfig.java

@@ -1,20 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@Configuration
-@Import(value = {DBConfig.class, MybatisPlusConfig.class})
-@ComponentScan("com.baomidou.mybatisplus.extension.test.h2.service")
-public class ServiceConfig {
-
-
-}

+ 0 - 20
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/config/ServiceSequenceConfig.java

@@ -1,20 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.config;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * <p>
- * H2 Sequence test config
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Configuration
-@Import(value = {DBConfig.class, MybatisPlusSequenceConfig.class})
-@ComponentScan("com.baomidou.mybatisplus.extension.test.h2.service")
-public class ServiceSequenceConfig {
-
-}

+ 0 - 85
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2PersonCamelMapper.java

@@ -1,85 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Person;
-
-
-/**
- * <p>
- * 这里继承自定义父类 SuperMapper
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2PersonCamelMapper extends SuperMapper<H2Person> {
-
-    @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
-            " join h2person u on u.testId=a.test_id and u.testId=#{userId}"
-    )
-    List<H2Addr> getAddrListByUserId(@Param("userId") Long userId);
-
-    @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
-            " join h2person u on u.testId=a.test_id and u.testId=#{userId}"
-    )
-    List<H2Addr> getAddrListByUserIdPage(@Param("userId") Long userId, Page<H2Addr> page);
-
-    @Insert(
-        "insert into h2person(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2person set name=#{name} where testId=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-
-
-    @Insert(
-        "insert into h2person(name,version) values( #{user1.name}, #{user1.version})"
-    )
-    int myInsertWithParam(@Param("user1") H2Person user1);
-
-    @Insert(
-        "insert into h2person(name,version) values( #{name}, #{version})"
-    )
-    int myInsertWithoutParam(H2Person user1);
-
-
-    @Select(" select testId as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithParamInSelectStatememt(Map<String, Object> param);
-
-    @Select(" select testId as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithParamInSelectStatememt4Page(Map<String, Object> param, Page<H2Person> page);
-
-    @Select(" select testId as id, power(${ageFrom},2) as age, '${nameParam}' as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithDollarParamInSelectStatememt4Page(Map<String, Object> param, Page<H2Person> page);
-
-
-    @Select("select count(1) from (" +
-        "select testId as id, CAST(#{nameParam} AS VARCHAR) as name" +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} " +
-        ") a")
-    int selectCountWithParamInSelectItems(Map<String, Object> param);
-
-    @Select("select * from h2person")
-    List<Map> mySelectMaps();
-}

+ 0 - 88
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2PersonLogicDeleteMapper.java

@@ -1,88 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Person;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2PersonLogicDelete;
-
-
-/**
- * <p>
- * 这里继承自定义父类 SuperMapper
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2PersonLogicDeleteMapper extends SuperMapper<H2PersonLogicDelete> {
-
-    @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
-            " join h2person u on u.testId=a.test_id and u.testId=#{userId}"
-    )
-    @SqlParser(filter = true)
-    List<H2Addr> getAddrListByUserId(@Param("userId") Long userId);
-
-    @Select(
-        "select a.addr_id as addrId, a.addr_name as addrName from h2address a" +
-            " join h2person u on u.testId=a.test_id and u.testId=#{userId}"
-    )
-    List<H2Addr> getAddrListByUserIdPage(@Param("userId") Long userId, Page<H2Addr> page);
-
-    @Insert(
-        "insert into h2person(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2person set name=#{name} where testId=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-
-
-    @Insert(
-        "insert into h2person(name,version) values( #{user1.name}, #{user1.version})"
-    )
-    int myInsertWithParam(@Param("user1") H2Person user1);
-
-    @Insert(
-        "insert into h2person(name,version) values( #{name}, #{version})"
-    )
-    int myInsertWithoutParam(H2Person user1);
-
-
-    @Select(" select testId as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithParamInSelectStatememt(Map<String, Object> param);
-
-    @Select(" select testId as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithParamInSelectStatememt4Page(Map<String, Object> param, Page<H2Person> page);
-
-    @Select(" select testId as id, power(${ageFrom},2) as age, '${nameParam}' as name " +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2Person> selectUserWithDollarParamInSelectStatememt4Page(Map<String, Object> param, Page<H2Person> page);
-
-
-    @Select("select count(1) from (" +
-        "select testId as id, CAST(#{nameParam} AS VARCHAR) as name" +
-        " from h2person " +
-        " where age>#{ageFrom} and age<#{ageTo} " +
-        ") a")
-    int selectCountWithParamInSelectItems(Map<String, Object> param);
-
-    @Select("select * from h2person")
-    List<Map> mySelectMaps();
-}

+ 0 - 30
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserDateVersionMapper.java

@@ -1,30 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserDateVersion;
-
-/**
- * <p>
- * H2User without version column
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2UserDateVersionMapper extends BaseMapper<H2UserDateVersion> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserExtendsMapper.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface H2UserExtendsMapper extends BaseMapper<H2UserIntVersionExtendTO> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 36
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteMapper.java

@@ -1,36 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
-
-/**
- * <p>
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-public interface H2UserLogicDeleteMapper extends BaseMapper<H2UserLogicDelete> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-
-    @Select(
-        "select test_id as id, name, age, version, test_type as testType from h2user where test_id=#{id}"
-    )
-    H2UserLogicDelete selectByIdMy(@Param("id") Long id);
-}

+ 0 - 15
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserLogicDeleteWithARMapper.java

@@ -1,15 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDeleteWithAR;
-
-/**
- * <p>
- * 这里继承自定义父类 SuperMapper
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2UserLogicDeleteWithARMapper extends SuperMapper<H2UserLogicDeleteWithAR> {
-
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserMetaobjMapper.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-
-/**
- * <p>
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2UserMetaobjMapper extends BaseMapper<H2UserMetaObj> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 30
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserNoVersionMapper.java

@@ -1,30 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-
-/**
- * <p>
- * H2User without version column
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2UserNoVersionMapper extends BaseMapper<H2UserNoVersion> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceExtendsMapper.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface H2UserSequenceExtendsMapper extends BaseMapper<H2UserSequenceExtendTO> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserSequenceMapper.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface H2UserSequenceMapper extends BaseMapper<H2UserSequence> {
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-}

+ 0 - 63
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java

@@ -1,63 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2Addr;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
-
-/**
- * <p>
- * 带version和逻辑删除
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/29
- */
-public interface H2UserVersionAndLogicDeleteMapper extends BaseMapper<H2UserVersionAndLogicDeleteEntity> {
-
-
-    @Select(
-        "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(
-        "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, Page<H2Addr> page);
-
-    @Insert(
-        "insert into h2user(name,version) values(#{name},#{version})"
-    )
-    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
-
-    @Update(
-        "update h2user set name=#{name} where test_id=#{id}"
-    )
-    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
-
-
-    @Insert(
-        "insert into h2user(name,version) values( #{user1.name}, #{user1.version})"
-    )
-    int myInsertWithParam(@Param("user1") H2UserVersionAndLogicDeleteEntity user1);
-
-    @Insert(
-        "insert into h2user(name,version) values( #{name}, #{version})"
-    )
-    int myInsertWithoutParam(H2UserVersionAndLogicDeleteEntity user1);
-
-    @Select("select test_id as id, version, last_updated_dt from h2user where test_id=#{id}")
-    H2UserVersionAndLogicDeleteEntity selectMyRecordById(@Param("id") Long id);
-}

+ 0 - 28
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2UserVersionIntWithARMapper.java

@@ -1,28 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionIntWithAR;
-
-/**
- * <p>
- * 这里继承自定义父类 SuperMapper
- * </p>
- *
- * @author Caratacus
- * @date 2017/4/1
- */
-public interface H2UserVersionIntWithARMapper extends SuperMapper<H2UserVersionIntWithAR> {
-
-    @Select(
-        "select test_id as id, name, age, version, test_type as testType from h2user where test_id=#{id}"
-    )
-    public H2UserVersionIntWithAR selectByIdWithoutLogicDeleteLimit(@Param("id") Long id);
-
-    @Update(
-        "update h2user set version=1 where test_id=#{id}"
-    )
-    public void updateLogicDeletedRecord(@Param("id") Long id);
-}

+ 0 - 16
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/mapper/H2uuidMapper.java

@@ -1,16 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.mapper;
-
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2uuid;
-
-/**
- * <p>
- * 测试 uuid 主键
- * </p>
- *
- * @author hubin
- * @date 2017-06-28
- */
-public interface H2uuidMapper extends SuperMapper<H2uuid> {
-
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseIntVersionEntity.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * Base Entity
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-public abstract class BaseIntVersionEntity implements Serializable {
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-    @TableId(value = "test_id")
-    private Long id;
-
-    @Version
-    private Integer version;
-}

+ 0 - 32
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/BaseSequenceEntity.java

@@ -1,32 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-@KeySequence("SEQ_TEST")
-public abstract class BaseSequenceEntity {
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "TEST_ID", type = IdType.INPUT)
-    private Long id;
-
-}

+ 0 - 104
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2Person.java

@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntityCamel;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2person")
-public class H2Person extends SuperEntityCamel {
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "testType", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @TableField
-    private Date testDate;
-
-    @Version
-    private Integer version;
-
-
-    public H2Person() {
-
-    }
-
-    public H2Person(String name) {
-        this.name = name;
-    }
-
-    public H2Person(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2Person(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2Person(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2Person(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2Person(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2Person(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 104
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2PersonLogicDelete.java

@@ -1,104 +0,0 @@
-/**
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntityCamel;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2person")
-public class H2PersonLogicDelete extends SuperEntityCamel {
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "testType", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @TableField
-    private Date testDate;
-
-    @TableLogic(value = "0", delval = "-1")
-    private Integer version;
-
-
-    public H2PersonLogicDelete() {
-
-    }
-
-    public H2PersonLogicDelete(String name) {
-        this.name = name;
-    }
-
-    public H2PersonLogicDelete(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2PersonLogicDelete(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2PersonLogicDelete(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2PersonLogicDelete(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2PersonLogicDelete(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2PersonLogicDelete(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 115
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserDateVersion.java

@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserDateVersion implements Serializable {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-    @TableId(value = "test_id")
-    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    private Integer version;
-
-    @TableField(value = "test_date")
-    @Version
-    private Date testDate;
-
-    @TableField("last_updated_dt")
-    private Date lastUpdatedDt;
-
-    public H2UserDateVersion() {
-
-    }
-
-    public H2UserDateVersion(String name) {
-        this.name = name;
-    }
-
-    public H2UserDateVersion(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserDateVersion(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserDateVersion(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public H2UserDateVersion(Long id, Integer age) {
-        this.id = id;
-        this.age = age;
-    }
-
-    public H2UserDateVersion(Long id, String name, Integer age, Integer testType) {
-        this.id = id;
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserDateVersion(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 45
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserIntVersionExtendTO.java

@@ -1,45 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserIntVersionExtendTO extends BaseIntVersionEntity {
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-
-    @TableField("last_updated_dt")
-    private Date lastUpdatedDt;
-}

+ 0 - 58
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDelete.java

@@ -1,58 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试逻辑删除实体
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserLogicDelete {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-    @TableId(value = "test_id", type = IdType.AUTO)
-    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    //    @Version
-    @TableLogic
-    private Integer version;
-
-    @TableField(value = "last_updated_dt")
-    private Timestamp lastUpdatedDt;
-
-}

+ 0 - 116
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserLogicDeleteWithAR.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserLogicDeleteWithAR extends Model<H2UserLogicDeleteWithAR> {
-
-    @TableId(value = "test_id")
-    private Long id;
-
-    @TableField(value = "last_updated_dt", fill = FieldFill.UPDATE)
-    private Date lastUpdatedDt;
-
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @TableField
-    private Date testDate;
-
-    @TableLogic
-    private Integer version;
-
-
-    public H2UserLogicDeleteWithAR() {
-
-    }
-
-    public H2UserLogicDeleteWithAR(String name) {
-        this.name = name;
-    }
-
-    public H2UserLogicDeleteWithAR(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserLogicDeleteWithAR(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserLogicDeleteWithAR(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2UserLogicDeleteWithAR(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2UserLogicDeleteWithAR(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserLogicDeleteWithAR(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return id;
-    }
-}

+ 0 - 112
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserMetaObj.java

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserMetaObj extends SuperEntity implements Serializable {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-//    @TableId(value = "test_id", type = IdType.AUTO)
-//    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", fill = FieldFill.INSERT)
-    private Integer testType;
-
-    private String desc;
-
-    @Version
-    private Integer version;
-//    @TableField(value = "last_updated_dt",fill = FieldFill.UPDATE)
-//    private Timestamp lastUpdatedDt;
-
-
-    public H2UserMetaObj() {
-
-    }
-
-    public H2UserMetaObj(String name) {
-        this.name = name;
-    }
-
-    public H2UserMetaObj(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserMetaObj(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserMetaObj(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2UserMetaObj(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2UserMetaObj(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserMetaObj(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 110
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserNoVersion.java

@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserNoVersion implements Serializable {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-    @TableId(value = "test_id")
-    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    private Integer version;
-
-    @TableField("last_updated_dt")
-    private Date lastUpdatedDt;
-
-    public H2UserNoVersion() {
-
-    }
-
-    public H2UserNoVersion(String name) {
-        this.name = name;
-    }
-
-    public H2UserNoVersion(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserNoVersion(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserNoVersion(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public H2UserNoVersion(Long id, Integer age) {
-        this.id = id;
-        this.age = age;
-    }
-
-    public H2UserNoVersion(Long id, String name, Integer age, Integer testType) {
-        this.id = id;
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserNoVersion(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 22
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSeq.java

@@ -1,22 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-@KeySequence("SEQ_TEST")
-public class H2UserSeq {
-
-}

+ 0 - 61
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequence.java

@@ -1,61 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-@KeySequence("SEQ_TEST")
-public class H2UserSequence {
-
-
-    public H2UserSequence() {
-    }
-
-    public H2UserSequence(String name, Integer version) {
-        this.name = name;
-        this.version = version;
-    }
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "TEST_ID", type = IdType.INPUT)
-    private Long id;
-
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @Version
-    private Integer version;
-
-
-}

+ 0 - 50
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserSequenceExtendTO.java

@@ -1,50 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.entity.persistent;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserSequenceExtendTO extends BaseSequenceEntity {
-
-    public H2UserSequenceExtendTO() {
-    }
-
-    public H2UserSequenceExtendTO(String name, Integer version) {
-        this.name = name;
-        this.version = version;
-    }
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @Version
-    private Integer version;
-
-}

+ 0 - 118
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionAndLogicDeleteEntity.java

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
-import com.baomidou.mybatisplus.extension.test.h2.entity.SuperEntity;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserVersionAndLogicDeleteEntity extends SuperEntity implements Serializable {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-//    @TableId(value = "test_id")
-//    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @TableLogic
-    private Integer version;
-
-    @TableField(value = "test_date")
-    @Version
-    private Date testDate;
-
-//    @TableField(value = "last_updated_dt", fill = FieldFill.UPDATE)
-//    private Date lastUpdatedDt;
-
-    public H2UserVersionAndLogicDeleteEntity() {
-
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(String name) {
-        this.name = name;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserVersionAndLogicDeleteEntity(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-}

+ 0 - 116
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2UserVersionIntWithAR.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@Data
-@Accessors(chain = true)
-@TableName("h2user")
-public class H2UserVersionIntWithAR extends Model<H2UserVersionIntWithAR> {
-
-    @TableId(value = "test_id")
-    private Long id;
-
-    @TableField(value = "last_updated_dt", fill = FieldFill.UPDATE)
-    private Date lastUpdatedDt;
-
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
-    private Integer testType;
-
-    private String desc;
-
-    @TableField
-    private Date testDate;
-
-    @Version
-    private Integer version;
-
-
-    public H2UserVersionIntWithAR() {
-
-    }
-
-    public H2UserVersionIntWithAR(String name) {
-        this.name = name;
-    }
-
-    public H2UserVersionIntWithAR(Integer testType) {
-        this.testType = testType;
-    }
-
-    public H2UserVersionIntWithAR(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public H2UserVersionIntWithAR(Long id, String name) {
-        this.setId(id);
-        this.name = name;
-    }
-
-    public H2UserVersionIntWithAR(Long id, Integer age) {
-        this.setId(id);
-        this.age = age;
-    }
-
-    public H2UserVersionIntWithAR(Long id, String name, Integer age, Integer testType) {
-        this.setId(id);
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public H2UserVersionIntWithAR(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return id;
-    }
-}

+ 0 - 59
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/entity/persistent/H2uuid.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.entity.persistent;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 测试 UUID 主键
- * </p>
- *
- * @author hubin
- * @Date 2017-06-28
- */
-@Data
-@Accessors(chain = true)
-@TableName("h2uuid")
-public class H2uuid implements Serializable {
-
-    // 静态属性会自动忽略
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(type = IdType.UUID)
-    private String id;
-
-    private String type;
-
-    public H2uuid() {
-
-    }
-
-    public H2uuid(String type) {
-        this.type = type;
-    }
-
-}

+ 0 - 55
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/hikaricp/H2HikaricpTest.java

@@ -1,55 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.hikaricp;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.DBHikaricpH2Config;
-import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/12/22
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DBHikaricpH2Config.class, MybatisConfigMetaObjOptLockConfig.class})
-public class H2HikaricpTest extends H2Test {
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(DBHikaricpH2Config.class);
-        context.register(MybatisConfigMetaObjOptLockConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Autowired
-    H2UserVersionAndLogicDeleteMapper userMapper;
-
-    @Test
-    public void testPerformanceInteceptor() {
-        userMapper.selectList(new EntityWrapper<H2UserVersionAndLogicDeleteEntity>());
-    }
-}

+ 0 - 16
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserExtendsService.java

@@ -1,16 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-
-/**
- * <p>
- * 实体继承id,version
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface IH2UserExtendsService extends IService<H2UserIntVersionExtendTO> {
-
-}

+ 0 - 16
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserLogicDeleteService.java

@@ -1,16 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-public interface IH2UserLogicDeleteService extends IService<H2UserLogicDelete> {
-
-    H2UserLogicDelete selectByIdMy(Long id);
-}

+ 0 - 16
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserMetaobjService.java

@@ -1,16 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/27
- */
-public interface IH2UserMetaobjService extends IService<H2UserMetaObj> {
-
-}

+ 0 - 31
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserNoVersionService.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-
-/**
- * <p>
- * Service层测试
- * </p>
- *
- * @author hubin
- * @date 2017-01-30
- */
-public interface IH2UserNoVersionService extends IService<H2UserNoVersion> {
-
-}

+ 0 - 15
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceExtendsService.java

@@ -1,15 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface IH2UserSequenceExtendsService extends IService<H2UserSequenceExtendTO> {
-
-}

+ 0 - 15
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserSequenceService.java

@@ -1,15 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-public interface IH2UserSequenceService extends IService<H2UserSequence> {
-
-}

+ 0 - 19
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/IH2UserVersionIntWithARService.java

@@ -1,19 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service;
-
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionIntWithAR;
-
-/**
- * <p>
- * AR模式的service
- * </p>
- *
- * @author yuxiaobin
- * @date 2018/3/15
- */
-public interface IH2UserVersionIntWithARService {
-
-    public void updateLogicDeletedRecord(Long id);
-
-    public H2UserVersionIntWithAR selectByIdWithoutLogicDeleteLimit(Long id);
-
-}

+ 0 - 20
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserExtendsServiceImpl.java

@@ -1,20 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserExtendsMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserIntVersionExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserExtendsService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Service
-public class H2UserExtendsServiceImpl extends ServiceImpl<H2UserExtendsMapper, H2UserIntVersionExtendTO> implements IH2UserExtendsService {
-
-}

+ 0 - 29
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java

@@ -1,29 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserLogicDeleteMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserLogicDelete;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserLogicDeleteService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/15
- */
-@Service
-public class H2UserLogicDeleteServiceImpl extends ServiceImpl<H2UserLogicDeleteMapper, H2UserLogicDelete> implements IH2UserLogicDeleteService {
-
-    @Autowired
-    H2UserLogicDeleteMapper userLogicDeleteMapper;
-
-
-    @Override
-    public H2UserLogicDelete selectByIdMy(Long id) {
-        return userLogicDeleteMapper.selectByIdMy(id);
-    }
-}

+ 0 - 21
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserMetaobjServiceImpl.java

@@ -1,21 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserMetaObj;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserMetaobjService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/27
- */
-@Service
-public class H2UserMetaobjServiceImpl extends ServiceImpl<H2UserMetaobjMapper, H2UserMetaObj> implements IH2UserMetaobjService {
-
-}

+ 0 - 36
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserNoVersionServiceImpl.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.h2.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserNoVersionMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserNoVersionService;
-
-/**
- * <p>
- * Service层测试
- * </p>
- *
- * @author hubin
- * @date 2017-01-30
- */
-@Service
-public class H2UserNoVersionServiceImpl extends ServiceImpl<H2UserNoVersionMapper, H2UserNoVersion> implements IH2UserNoVersionService {
-
-}

+ 0 - 20
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceExtendsServiceImpl.java

@@ -1,20 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserSequenceExtendsMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequenceExtendTO;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserSequenceExtendsService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Service
-public class H2UserSequenceExtendsServiceImpl extends ServiceImpl<H2UserSequenceExtendsMapper, H2UserSequenceExtendTO> implements IH2UserSequenceExtendsService {
-
-}

+ 0 - 20
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserSequenceServiceImpl.java

@@ -1,20 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserSequenceMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserSequence;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserSequenceService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2017/6/26
- */
-@Service
-public class H2UserSequenceServiceImpl extends ServiceImpl<H2UserSequenceMapper, H2UserSequence> implements IH2UserSequenceService {
-
-}

+ 0 - 34
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/service/impl/H2UserVersionIntWithARServiceImpl.java

@@ -1,34 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionIntWithARMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionIntWithAR;
-import com.baomidou.mybatisplus.extension.test.h2.service.IH2UserVersionIntWithARService;
-
-/**
- * <p>
- * </p>
- *
- * @author yuxiaobin
- * @date 2018/3/15
- */
-@Service
-public class H2UserVersionIntWithARServiceImpl implements IH2UserVersionIntWithARService {
-
-    @Autowired
-    H2UserVersionIntWithARMapper h2UserVersionIntWithARMapper;
-
-    @Override
-    @Transactional
-    public void updateLogicDeletedRecord(Long id) {
-        h2UserVersionIntWithARMapper.updateLogicDeletedRecord(id);
-    }
-
-    @Override
-    public H2UserVersionIntWithAR selectByIdWithoutLogicDeleteLimit(Long id) {
-        return h2UserVersionIntWithARMapper.selectByIdWithoutLogicDeleteLimit(id);
-    }
-}

+ 0 - 57
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/h2/tomcatjdbc/TomcatJdbcH2Test.java

@@ -1,57 +0,0 @@
-package com.baomidou.mybatisplus.extension.test.h2.tomcatjdbc;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.extension.test.h2.base.H2Test;
-import com.baomidou.mybatisplus.extension.test.h2.config.DBHikaricpH2Config;
-import com.baomidou.mybatisplus.extension.test.h2.config.DBTomcatjdbcH2Config;
-import com.baomidou.mybatisplus.extension.test.h2.config.MybatisConfigMetaObjOptLockConfig;
-import com.baomidou.mybatisplus.extension.test.h2.entity.mapper.H2UserVersionAndLogicDeleteMapper;
-import com.baomidou.mybatisplus.extension.test.h2.entity.persistent.H2UserVersionAndLogicDeleteEntity;
-
-/**
- * <p>
- * Tomcatjdbc数据源测试
- * </p>
- *
- * @author yuxiaobin
- * @date 2018/1/3
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DBTomcatjdbcH2Config.class, MybatisConfigMetaObjOptLockConfig.class})
-public class TomcatJdbcH2Test extends H2Test {
-
-    @BeforeClass
-    public static void initDB() throws SQLException, IOException {
-        @SuppressWarnings("resource")
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(DBHikaricpH2Config.class);
-        context.register(MybatisConfigMetaObjOptLockConfig.class);
-        context.refresh();
-        DataSource ds = (DataSource) context.getBean("dataSource");
-        try (Connection conn = ds.getConnection()) {
-            initData(conn);
-        }
-    }
-
-    @Autowired
-    H2UserVersionAndLogicDeleteMapper userMapper;
-
-    @Test
-    public void testPerformanceInteceptor() {
-        userMapper.selectList(new EntityWrapper<H2UserVersionAndLogicDeleteEntity>());
-    }
-}

+ 0 - 63
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/CircularLabelsTest.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.session.SqlSession;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-/**
- * <p>
- * 循环标签 查询分页失效 测试类
- * </p>
- *
- * @author Caratacus
- * @Date 2016-12-21
- */
-public class CircularLabelsTest extends CrudTest {
-
-    /**
-     * 循环标签 测试
-     */
-    @org.junit.Test
-    public void test() {
-        SqlSession session = this.sqlSessionFactory().openSession();
-        UserMapper userMapper = session.getMapper(UserMapper.class);
-        Page<User> page = new Page<>(1, 6);
-        List<User> users = userMapper.forSelect(page, Arrays.asList("1", "2", "3"));
-        System.out.println(users.toString());
-        System.out.println(page);
-        User user = new User();
-        user.setId(1L);
-        User users1 = userMapper.selectOne(user);
-        System.out.println(users1);
-        TestMapper mapper = session.getMapper(TestMapper.class);
-        Test test = new Test();
-        test.setCreateTime(new Date());
-        test.setType("11111");
-        mapper.insert(test);
-        session.rollback();
-    }
-}

+ 0 - 83
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/LogicDeleteTest.java

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-/**
- * <p>
- * 逻辑删除测试
- * </p>
- *
- * @author hubin
- * @date 2017-09-09
- */
-public class LogicDeleteTest extends CrudTest {
-
-    @Override
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig gc = super.globalConfiguration();
-        gc.setLogicDeleteValue("-1");// 逻辑删除值 -1 测试字段 type
-        return gc;
-    }
-
-    @Test
-    public void test() {
-        // 加载配置文件
-        SqlSession session = this.sqlSessionFactory().openSession();
-        UserMapper userMapper = session.getMapper(UserMapper.class);
-        System.err.println(" debug run 查询执行 user 表数据变化! ");
-        long id = IdWorker.getId();
-        int rlt = userMapper.insert(new User(id, "logic-delete-1", 18, 1));
-        System.err.println("插入成功记录数:" + rlt);
-        rlt = userMapper.deleteById(id);
-        System.err.println("根据 ID 逻辑删除成功记录数:" + rlt);
-
-        User uu = new User();
-        uu.setId(333L);
-        uu.setTestType(1);
-        System.err.println("第一次:逻辑删除testType 改为 1 成功记录数:" + rlt);
-        rlt = userMapper.insert(new User(IdWorker.getId(), "logic-delete-2", 28, 2));
-        System.err.println("再插入一条成功记录数:" + rlt);
-        rlt = userMapper.delete(Condition.<User>entityWrapper().eq("test_id", 1111));
-        System.err.println("全表逻辑删除成功记录数:" + rlt);
-        List<User> userList = userMapper.selectList(null);
-        for (User u : userList) {
-            System.out.println("全表逻辑删除 ( id= " + u.getId() + " ) 展示结果" + u.getTestType());
-        }
-
-        System.err.println("第二次:逻辑删除testType 改为 1 成功记录数:" + rlt);
-        Map<String, Object> map = new HashMap<>();
-        map.put("test_id", id);
-        rlt = userMapper.deleteByMap(map);
-        System.err.println("全表逻辑删除 ByMap 成功记录数:" + rlt);
-        userList = userMapper.selectList(null);
-        for (User u : userList) {
-            System.out.println("全表逻辑删除 ( id= " + u.getId() + " ) 展示结果" + u.getTestType());
-        }
-    }
-}

+ 0 - 35
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyBaseMapper.java

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 自定义 Mapper 接口
- * </p>
- *
- * @author hubin
- * @date 2017-03-14
- */
-public interface MyBaseMapper<T> extends BaseMapper<T> {
-
-    // 测试自定义 Mapper 接口
-
-    // 这个类  不要放到  mapper 扫描目录,否则会当做真实 表 mapper 扫描异常!!
-
-}

+ 0 - 61
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MyMetaObjectHandler.java

@@ -1,61 +0,0 @@
-/*
- * 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.extension.test.mysql;
-
-import org.apache.ibatis.reflection.MetaObject;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-
-
-/**
- * <p>
- * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
- * </p>
- *
- * @author hubin
- * @Date 2016-08-28
- */
-public class MyMetaObjectHandler extends MetaObjectHandler {
-
-    /**
-     * 测试 user 表 name 字段为空自动填充
-     */
-    @Override
-    public void insertFill(MetaObject metaObject) {
-        // 测试下划线
-        Object testType = getFieldValByName("testType", metaObject);
-        System.out.println("testType=" + testType);
-        if (testType == null) {// 如果不会设置这里不需要判断, 直接 set
-            System.out.println("*************************");
-            System.out.println("insert fill");
-            System.out.println("*************************");
-            setFieldValByName("testType", 3, metaObject);
-        }
-    }
-
-    @Override
-    public boolean openUpdateFill() {
-        System.out.println("*************************");
-        System.out.println(" 关闭更新填充 ");
-        System.out.println("*************************");
-        return false;
-    }
-
-    @Override
-    public void updateFill(MetaObject metaObject) {
-        // 这里不会执行
-    }
-}

+ 0 - 63
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/MySqlInjector.java

@@ -1,63 +0,0 @@
-/*
- * 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.extension.test.mysql;
-
-import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-
-
-/**
- * <p>
- * 测试自定义注入 SQL
- * </p>
- *
- * @author hubin
- * @Date 2016-07-23
- */
-public class MySqlInjector extends DefaultSqlInjector {
-
-//    @Override
-//    public void inject(Configuration configuration, MapperBuilderAssistant builderAssistant, Class<?> mapperClass,
-//                       Class<?> modelClass, TableInfo table) {
-//        /* 添加一个自定义方法 */
-//        deleteAllUser(mapperClass, modelClass, table);
-//        // 测试 com.baomidou.mybatisplus.extension.test.mysql.MetaObjectHandlerTest
-//        deleteLogicById(mapperClass, modelClass, table);
-//    }
-//
-//    public void deleteAllUser(Class<?> mapperClass, Class<?> modelClass, TableInfo table) {
-//
-//        /* 执行 SQL ,动态 SQL 参考类 SqlMethod */
-//        String sql = "delete from " + table.getTableName();
-//
-//        /* mapper 接口方法名一致 */
-//        String method = "deleteAll";
-//        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-//        this.addDeleteMappedStatement(mapperClass, method, sqlSource);
-//    }
-//
-//    public void deleteLogicById(Class<?> mapperClass, Class<?> modelClass, TableInfo table) {
-//
-//        /* 执行 SQL ,动态 SQL 参考类 SqlMethod */
-//        String sql = String.format("UPDATE %s SET test_type=-1 WHERE test_id=#{id}", table.getTableName());
-//
-//        /* mapper 接口方法名一致 */
-//        String method = "deleteLogicById";
-//        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
-//
-//        // 注意!! 这里是更新、删除、插入、调用方法注入不一样!!
-//        this.addUpdateMappedStatement(mapperClass, modelClass, method, sqlSource);
-//    }
-}

+ 0 - 70
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/NoXMLTest.java

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.session.RowBounds;
-import org.apache.ibatis.session.SqlSession;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Test;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.TestMapper;
-
-/**
- * <p>
- * 测试没有XML同样注入CRUD SQL
- * </p>
- *
- * @author Caratacus
- * @date 2016-09-26
- */
-public class NoXMLTest extends CrudTest {
-
-    @org.junit.Test
-    public void test() {
-        SqlSession sqlSession = this.sqlSessionFactory().openSession();
-        /**
-         * 查询是否有结果
-         */
-        TestMapper testMapper = sqlSession.getMapper(TestMapper.class);
-        testMapper.insert(new Test(IdWorker.getId(), "Caratacus"));
-        List<Map<String, Object>> list = testMapper.selectMaps(null);
-        List<Map<String, Object>> list1 = testMapper.selectMapsPage(RowBounds.DEFAULT, null);
-        List<Map<String, Object>> list2 = testMapper.selectMapsPage(new Page<>(1, 5), null);
-        System.out.println(list);
-        System.out.println(list1);
-        System.out.println(list2);
-        Map<String, Object> map = new HashMap<>();
-        map.put("type", null);
-        map.put("id", null);
-        List<Test> tests = testMapper.selectByMap(map);
-        if (null != tests) {
-            for (Test test : tests) {
-                System.out.println("id:" + test.getId() + " , type:" + test.getType());
-            }
-        } else {
-            System.err.println(" tests is null. ");
-        }
-        testMapper.delete(null);
-
-    }
-
-}

+ 0 - 57
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/ServiceImplTest.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.service.IUserService;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.service.IUserService;
-
-/**
- * <p>
- * Service层测试
- * </p>
- *
- * @author hubin
- * @date 2017-01-30
- */
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@ContextConfiguration({ "classpath:spring/spring-servlet.xml" })
-public class ServiceImplTest {
-
-    @Autowired
-    private IUserService userService;
-
-    //@Test
-    public void testInsertBatch() throws IOException {
-        List<User> userList = new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            userList.add(new User("u-" + i, i, i));
-        }
-        boolean batchResult = userService.insertBatch(userList);
-        System.err.println("batchResult: " + batchResult);
-
-        // 注入测试
-        userService.testSqlInjector();
-    }
-
-}

+ 0 - 77
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/SqlRunnerTest.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-
-
-/**
- * <p>
- * 测试SqlRunner
- * </p>
- *
- * @author Caratacus
- * @date 2016-12-19
- */
-public class SqlRunnerTest extends CrudTest {
-
-    @Test
-    public void test1() {
-        /*
-         * 加载配置文件
-         */
-        TableInfoHelper.initSqlSessionFactory(this.sqlSessionFactory());
-
-        boolean b = SqlRunner.db().insert("INSERT INTO `test` (`id`, `type`) VALUES ('107880983085826048', 't1021')");
-        System.out.println(b);
-        Assert.assertTrue(b);
-        boolean b1 = SqlRunner.db().update("UPDATE `test` SET `type`='tttttttt' WHERE (`id`=107880983085826048)");
-        System.out.println(b1);
-
-        Assert.assertTrue(b1);
-        List<Map<String, Object>> maps = SqlRunner.db().selectList("select * from test WHERE (`id`=107880983085826048)");
-        System.out.println(maps);
-        String type = (String) maps.get(0).get("type");
-        System.out.println(type);
-        Assert.assertEquals("tttttttt", type);
-        boolean b2 = SqlRunner.db().delete("DELETE from test WHERE (`id`=107880983085826048)");
-        System.out.println(b2);
-        Assert.assertTrue(b2);
-        List<Map<String, Object>> maps1 = SqlRunner.db().selectList("select * from test WHERE (`id`=107880983085826048)");
-        System.out.println(maps1);
-        if (CollectionUtils.isEmpty(maps1)) {
-            maps1 = null;
-        }
-        Assert.assertNull(maps1);
-        Page<Map<String, Object>> mapPage = SqlRunner.db().selectPage(new Page<>(1, 5), "select * from test ");
-        System.out.println(mapPage);
-        int i = SqlRunner.db().selectCount("select count(0) from test ");
-        System.out.println("count:" + i);
-
-    }
-
-}

+ 0 - 60
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/TransactionalTest.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-/**
- * <p>
- * MySQL 数据库,表引擎  MyISAM  不支持事务,请使用  InnoDB  !!!!
- * </p>
- *
- * @author hubin
- * @date 2016-09-20
- */
-public class TransactionalTest extends CrudTest {
-
-    /**
-     * <p>
-     * 事务测试
-     * </p>
-     */
-    @Test
-    public void test() {
-        SqlSession sqlSession = this.sqlSessionFactory().openSession();
-
-        /**
-         * 插入
-         */
-        UserMapper userMapper = sqlSession.getMapper(UserMapper.class);
-        int rlt = userMapper.insert(new User(IdWorker.getId(), "1", 1, 1));
-        System.err.println("--------- insertInjector --------- " + rlt);
-
-        //session.commit();
-        sqlSession.rollback();
-        sqlSession.close();
-    }
-
-}

+ 0 - 114
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/URPTest.java

@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.List;
-
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.PhoneNumber;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.PhoneNumber;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.RoleMapper;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-/**
- * <p>
- * 对User, Role及el, typeHandler, resultMap进行测试
- * </p>
- *
- * @author junyu
- * @Date 2016-09-09
- */
-public class URPTest extends CrudTest {
-
-    @Test
-    public void crossResultMapTest() {
-        // 加载配置文件
-        SqlSession session = this.sqlSessionFactory().openSession();
-        RoleMapper roleMapper = session.getMapper(RoleMapper.class);
-        Role role = new Role();
-        role.setName("K 神");
-        role.setDescription("无敌战神 K");
-        role.setSort(2);
-        roleMapper.insert(role);
-        UserMapper userMapper = session.getMapper(UserMapper.class);
-        List<Role> roles = userMapper.selectRoleList();
-        Assert.assertTrue(roles.size() >= 1);
-    }
-
-    @Test
-    public void urpTest() {
-        // 加载配置文件
-        SqlSession session = this.sqlSessionFactory().openSession();
-
-        UserMapper userMapper = session.getMapper(UserMapper.class);
-        RoleMapper roleMapper = session.getMapper(RoleMapper.class);
-
-        /**
-         * sjy 测试@TableField的el属性, 级联resultMap
-         */
-        Role role = new Role();
-        role.setId(IdWorker.getId());
-        role.setName("admin");
-        int rlt = roleMapper.insert(role);
-        System.err.println("--------- insert role --------- " + rlt);
-
-        PhoneNumber phone = new PhoneNumber("81", "0576", "82453832");
-
-        User userA = new User();
-        userA.setId(IdWorker.getId());
-        userA.setName("junyu_shi");
-        userA.setAge(15);
-        userA.setTestType(1);
-        userA.setRole(role);
-        userA.setPhone(phone);
-        rlt = userMapper.insert(userA);
-        System.err.println("--------- insert user --------- " + rlt);
-
-        User whereUser = userMapper.selectOne(userA);
-        System.err.println("--------- select user --------- " + whereUser.toString());
-
-        // 如果不使用el表达式, User类中就同时需要roleId用于对应User表中的字段,
-        // 和Role属性用于保存resultmap的级联查询. 在插入时, 就需要写user.setRoleId(), 然后updateUser.
-        role = new Role();
-        role.setId(IdWorker.getId());
-        role.setName("root");
-        roleMapper.insert(role);
-        userA.setRole(role);
-        userMapper.updateById(userA);
-        System.err.println("--------- upadte user's role --------- " + rlt);
-
-        whereUser = userMapper.selectOne(userA);
-        System.err.println("--------- select user --------- " + whereUser.toString());
-
-        userMapper.delete(new EntityWrapper<>(userA));
-        System.err.println("--------- delete user --------- " + rlt);
-
-    }
-
-}

+ 0 - 334
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/UserMapperTest.java

@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.session.SqlSession;
-import org.junit.Test;
-
-import com.baomidou.mybatisplus.core.conditions.EntityWrapper;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.pagination.Page;
-import com.baomidou.mybatisplus.core.pagination.Pagination;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.test.CrudTest;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.Role;
-import com.baomidou.mybatisplus.extension.test.mysql.entity.User;
-import com.baomidou.mybatisplus.extension.test.mysql.mapper.UserMapper;
-
-/**
- * <p>
- * MybatisPlus 测试类
- * </p>
- * <p>
- * 自动提交了事务问题:<br>
- * http://www.mybatis.org/spring/transactions.html#programmatic<br>
- * https://github.com/mybatis/spring/issues/39<br>
- * </p>
- *
- * @author hubin sjy
- * @Date 2016-01-23
- */
-public class UserMapperTest extends CrudTest {
-
-    @Override
-    public GlobalConfig globalConfiguration() {
-        GlobalConfig gc = super.globalConfiguration();
-        /**
-         * 设置,自定义 元对象填充器,实现公共字段自动写入
-         */
-        gc.setMetaObjectHandler(new MyMetaObjectHandler());
-        // gc.setCapitalMode(true);
-        gc.setDbColumnUnderline(true);
-        return gc;
-    }
-
-    /**
-     * RUN 测试
-     * <p>
-     * <p>
-     * MybatisPlus 加载 SQL 顺序:
-     * </p>
-     * 1、加载XML中的SQL<br>
-     * 2、加载sqlProvider中的SQL<br>
-     * 3、xmlSql 与 sqlProvider不能包含相同的SQL<br>
-     * <br>
-     * 调整后的SQL优先级:xmlSql > sqlProvider > crudSql <br>
-     */
-    @Test
-    public void crudTest() {
-        SqlSession session = this.sqlSessionFactory().openSession();
-        UserMapper userMapper = session.getMapper(UserMapper.class);
-        System.err.println(" debug run 查询执行 user 表数据变化! ");
-        userMapper.deleteAll();
-
-        /**
-         * sjy 测试@TableField的el属性
-         */
-        Role role = new Role();
-        role.setId(IdWorker.getId());
-        role.setName("admin");
-
-        User userA = new User();
-        userA.setId(IdWorker.getId());
-        userA.setName("junyu_shi");
-        userA.setAge(1);
-        userA.setDesc("测试一把");
-        userA.setTestType(1);
-        userA.setRole(role);
-
-        int rlt = userMapper.insert(userA);
-        User whereUser = userMapper.selectOne(userA);
-        print(whereUser);
-
-        userA.setAge(18);
-        userMapper.updateById(userA);
-        userMapper.delete(new EntityWrapper<>(userA));
-        System.err.println("--------- @TableField el() --------- " + rlt);
-
-        /**
-         * 注解插件测试
-         */
-        rlt = userMapper.insertInjector(new User(1L, "1", 1, 1));
-        System.err.println("--------- insertInjector --------- " + rlt);
-
-        /**
-         * ehcache 缓存测试
-         */
-        User cacheUser = userMapper.selectOne(new User(1L, 1));
-        print(cacheUser);
-        cacheUser = userMapper.selectOne(new User(1L, 1));
-        print(cacheUser);
-
-        /**
-         * 插入
-         */
-        long id = IdWorker.getId();
-        rlt = userMapper.insert(new User(id, "abc", 18, 1));
-        System.err.println("\n--------------insert-------" + rlt);
-        sleep();
-
-        rlt = userMapper.insert(new User(18));
-        System.err.println("\n----------测试 name 字段忽略验证----insert-------" + rlt);
-        sleep();
-
-        List<User> ul = new ArrayList<>();
-
-        /* 手动输入 ID */
-        ul.add(new User(11L, "1", 1, 0));
-        ul.add(new User(12L, "2", 2, 1));
-        ul.add(new User(13L, "3", 3, 1));
-        ul.add(new User(14L, "delname", 4, 0));
-        ul.add(new User(15L, "5", 5, 1));
-        ul.add(new User(16L, "6", 6, 0));
-
-        /* 测试 name test_type 填充 */
-        ul.add(new User(17L, 7));
-        ul.add(new User(18L, 8));
-        ul.add(new User(19L, 9));
-        ul.add(new User(7));
-        ul.add(new User(20L, "deleteByMap", 7, 0));
-
-        /* 使用 ID_WORKER 自动生成 ID */
-        ul.add(new User("8", 8, 1));
-        ul.add(new User("9", 9, 1));
-        for (User u : ul) {
-            rlt = userMapper.insert(u);
-        }
-        System.err.println("\n--------------insertBatch----------------" + rlt + "\n\n");
-        System.err.println("\n 自定义填充 testType=3 填充成功!" + userMapper.selectById(18L).toString());
-
-        /**
-         * 提交,往下操作在一个事物中!!!
-         */
-        session.commit();
-
-        /*
-         * 删除
-         */
-        rlt = userMapper.deleteById(id);
-        System.err.println("---------deleteById------- delete id=" + id + " ,result=" + rlt + "\n\n");
-        sleep();
-
-        Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("name", "deleteByMap");
-        columnMap.put("age", null);
-        rlt = userMapper.deleteByMap(columnMap);
-        System.err.println("---------deleteByMap------- result=" + rlt + "\n\n");
-        sleep();
-
-        List<Long> il = new ArrayList<>();
-        il.add(16L);
-        il.add(17L);
-        rlt = userMapper.deleteBatchIds(il);
-        System.err.println("---------deleteBatchIds------- delete id=" + id + " ,result=" + rlt + "\n\n");
-        sleep();
-
-        rlt = userMapper.delete(new EntityWrapper<>(new User(14L, "delname")));
-        System.err.println("--------------delete------------------ result=" + rlt + "\n\n");
-        sleep();
-
-        /*
-         * <p> 修改 </p>
-         *
-         * updateById 是从 SuperMapper 中继承而来的,UserMapper.xml中并没有申明改sql
-         */
-        rlt = userMapper.updateById(new User(12L, "MybatisPlus"));
-        System.err.println("------------------updateById---------------------- result=" + rlt + "\n\n");
-        sleep();
-
-        rlt = userMapper.updateById(new User(12L, "update all column", 12, 12));
-        System.err.println("------------------updateById---------------------- result=" + rlt + "\n\n");
-        sleep();
-
-        rlt = userMapper.update(new User("55", 55, 5), new EntityWrapper<>(new User(15L, "5")));
-        System.err.println("------------------update---------------------- result=" + rlt + "\n\n");
-        sleep();
-
-        EntityWrapper<User> ew1 = new EntityWrapper<>();
-        ew1.addFilter("test_id={0} AND name={1}", 15L, "55");
-        rlt = userMapper.update(new User("00"), ew1);
-        System.err.println("------------------update---------------------- result=" + rlt + "\n\n");
-        sleep();
-
-        /* 无条件选择更新 */
-        // userMapper.update(new User("11"), null);
-
-        List<User> userList = new ArrayList<>();
-        userList.add(new User(11L, "updateBatchById-1", 1, 1));
-        userList.add(new User(12L, "updateBatchById-2", 2, 1));
-        userList.add(new User(13L, "updateBatchById-3", 3, 1));
-        for (User u : userList) {
-            rlt = userMapper.updateById(u);
-        }
-        System.err.println("------------------updateBatchById---------------------- result=" + rlt + "\n\n");
-        sleep();
-
-        /*
-         * <p> 查询 </p>
-         */
-        System.err.println("\n------------------selectById----------------------");
-        User user = userMapper.selectById(12L);
-        print(user);
-
-        System.err.println("\n------------------selectBatchIds----------------------");
-        List<Long> idList = new ArrayList<>();
-        idList.add(11L);
-        idList.add(12L);
-        List<User> ul0 = userMapper.selectBatchIds(idList);
-        for (User anUl0 : ul0) {
-            print(anUl0);
-        }
-
-        System.err.println("\n------------------selectByMap-----满足 map 条件的数据----");
-        Map<String, Object> cm = new HashMap<>();
-        cm.put("test_type", 1);
-        cm.put("1", 1);
-        List<User> ul1 = userMapper.selectByMap(cm);
-        for (User anUl1 : ul1) {
-            print(anUl1);
-        }
-
-        System.err.println("\n------------------selectOne----------------------");
-        User userOne = userMapper.selectOne(new User("abc"));
-        print(userOne);
-
-        System.err.println("\n------------------selectCount----------------------");
-        System.err.println("查询 type=1 总记录数:" + userMapper.selectCount(new EntityWrapper<>(new User(1))));
-        System.err.println("总记录数:" + userMapper.selectCount(null));
-
-        System.err.println("\n------------------selectList-----所有数据----id--DESC--排序----");
-        List<User> ul2 = userMapper.selectList(new EntityWrapper<User>(null, "age,name"));
-        for (User anUl2 : ul2) {
-            print(anUl2);
-        }
-
-        System.err.println("\n------------------list 分页查询 ----查询 testType = 1 的所有数据--id--DESC--排序--------");
-        Page<User> page = new Page<>(1, 2);
-        EntityWrapper<User> ew = new EntityWrapper<>(new User(1));
-
-        /*
-         * 查询字段
-         */
-        ew.setSqlSelect("age,name");
-
-        /*
-         * 查询条件,SQL 片段(根据常用的写SQL的方式按顺序添加相关条件即可)
-         */
-        ew.where("name like {0}", "'%dateBatch%'").and("age={0}", 3).orderBy("age,name", true);
-        List<User> paginList = userMapper.selectPage(page, ew);
-        page.setRecords(paginList);
-        for (int i = 0; i < page.getRecords().size(); i++) {
-            print(page.getRecords().get(i));
-        }
-        System.err.println(" 翻页:" + page.toString());
-
-        System.err.println("\n---------------xml---selectListRow 分页查询,不查询总数(此时可自定义 count 查询)----无查询条件--------------");
-        // TODO 查询总数传 Page 对象即可
-        List<User> rowList = userMapper.selectListRow(new Pagination(0, 2, false));
-        for (User aRowList : rowList) {
-            print(aRowList);
-        }
-
-        /*
-         * 用户列表
-         */
-        System.err.println(" selectList EntityWrapper == null \n");
-        paginList = userMapper.selectList(null);
-        for (User aPaginList : paginList) {
-            print(aPaginList);
-        }
-
-        /**
-         * 自定义方法,删除测试数据
-         */
-        rlt = userMapper.deleteAll();
-        System.err.println("清空测试数据! rlt=" + rlt);
-
-        /**
-         * 提交
-         */
-        session.commit();
-    }
-
-    /*
-     * 打印测试信息
-     */
-    private static void print(User user) {
-        sleep();
-        if (user != null) {
-            System.out.println("\n user: id=" + user.getId() + ", name=" + user.getName() + ", age=" + user.getAge()
-                + ", testType=" + user.getTestType());
-        } else {
-            System.out.println("\n user is null.");
-        }
-    }
-
-    /*
-     * 慢点打印
-     */
-    private static void sleep() {
-        try {
-            Thread.sleep(1);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}

+ 0 - 77
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/NotPK.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 测试实体没有主键依然注入通用方法
- * </p>
- *
- * @author Caratacu
- * @Date 2016-12-22
- */
-@TableName("not_pk")
-public class NotPK implements Serializable {
-
-    // 静态属性会自动忽略
-    private static final long serialVersionUID = 1L;
-
-    private String uuid;
-
-    @TableField("is1")
-    private boolean isIs;
-    @TableField("is2")
-    private Boolean isis;
-
-    private String type;
-
-    public Boolean getIsis() {
-        return isis;
-    }
-
-    public void setIsis(Boolean isis) {
-        this.isis = isis;
-    }
-
-    public boolean isIs() {
-        return isIs;
-    }
-
-    public void setIs(boolean is) {
-        isIs = is;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

+ 0 - 86
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/PhoneNumber.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql.entity;
-
-/**
- * <p>
- * 测试手机号码
- * </p>
- *
- * @author junyu
- * @Date 2016-09-09
- */
-public class PhoneNumber {
-
-    private String countryCode;
-    private String stateCode;
-    private String number;
-
-    public PhoneNumber() {
-    }
-
-    public PhoneNumber(String countryCode, String stateCode, String number) {
-        this.countryCode = countryCode;
-        this.stateCode = stateCode;
-        this.number = number;
-    }
-
-    public PhoneNumber(String string) {
-        if (string != null) {
-            String[] parts = string.split("-");
-            if (parts.length > 0)
-                this.countryCode = parts[0];
-            if (parts.length > 1)
-                this.stateCode = parts[1];
-            if (parts.length > 2)
-                this.number = parts[2];
-        }
-    }
-
-    public String getAsString() {
-        return countryCode + "-" + stateCode + "-" + number;
-
-    }
-
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-
-    public String getStateCode() {
-        return stateCode;
-    }
-
-    public void setStateCode(String stateCode) {
-        this.stateCode = stateCode;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    @Override
-    public String toString() {
-        return getAsString();
-    }
-}

+ 0 - 96
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Role.java

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-/**
- * <p>
- * 测试角色类
- * </p>
- *
- * @author sjy
- * @Date 2016-09-09
- */
-@TableName(resultMap = "RoleMap")
-public class Role implements Serializable {
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId
-    private Long id;
-
-    /**
-     * 角色
-     */
-    private String name;
-
-    /**
-     * 排序
-     */
-    private Integer sort;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    public Long getId() {
-        return this.id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getSort() {
-        return this.sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @Override
-    public String toString() {
-        return "Role{" + "id=" + id + ", name='" + name + '\'' + ", sort=" + sort
-            + ", description='" + description + '\'' + '}';
-    }
-}

+ 0 - 91
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/Test.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-/**
- * <p>
- * 测试没有XML同样注入CRUD SQL 实体
- * </p>
- *
- * @author Caratacu
- * @Date 2016-09-25
- */
-// 表名为 test 可以不需要注解,特殊如 @TableName("tb_test")
-public class Test extends Model<Test> {
-
-    // 静态属性会自动忽略
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    // 默认会找 id 为主键,特殊命名需要注解 @TableId
-    private Long id;
-
-    private String type;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    public Test() {
-
-    }
-
-    public Test(Long id, String type) {
-        this.id = id;
-        this.type = type;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return id;
-    }
-
-    public String toString() {
-        return "{id=" + id + ",type=" + type + "}";
-    }
-
-}

+ 0 - 209
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/test/mysql/entity/User.java

@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2011-2014, 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.extension.test.mysql.entity;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-
-/**
- * <p>
- * 测试用户类
- * </p>
- *
- * @author hubin sjy
- * @Date 2016-09-09
- */
-/* 表名 value 注解【 驼峰命名可无 】, resultMap 注解测试【 映射 xml 的 resultMap 内容 】 */
-@TableName(resultMap = "userMap")
-public class User implements Serializable {
-
-    /* 表字段注解,false 表中不存在的字段,可无该注解 默认 true */
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /* 主键ID 注解,value 字段名,type 用户输入ID */
-    @TableId(value = "test_id")
-    private Long id;
-
-    /* 测试忽略验证 */
-    private String name;
-
-    private Integer age;
-
-    /*BigDecimal 测试*/
-    private BigDecimal price;
-
-    /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", fill = FieldFill.INSERT)
-    @TableLogic(value = "-2") // 该注解为了测试逻辑删除、这里设置 -2 为删除值
-    private Integer testType;
-
-    @TableField(el = "role.id")
-    private Role role;
-
-    private String desc = "默认描述";
-
-    @Version
-    private Integer version;
-
-    // 或@TableField(el = "role,jdbcType=BIGINT)
-    @TableField(el = "phone, typeHandler=com.baomidou.mybatisplus.extension.test.mysql.typehandler.PhoneTypeHandler")
-    private PhoneNumber phone;
-
-    public User() {
-
-    }
-
-    public User(String name) {
-        this.name = name;
-    }
-
-    public User(Integer testType) {
-        this.testType = testType;
-    }
-
-    public User(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public User(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public User(Long id, Integer age) {
-        this.id = id;
-        this.age = age;
-    }
-
-    public User(Long id, String name, Integer age, Integer testType) {
-        this.id = id;
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    public User(String name, Integer age, Integer testType) {
-        this.name = name;
-        this.age = age;
-        this.testType = testType;
-    }
-
-    /**
-     * 测试类型
-     */
-    public static void main(String args[]) throws IllegalAccessException {
-        User user = new User();
-        user.setName("12306");
-        user.setAge(3);
-        System.err.println(User.class.getName());
-        Field[] fields = user.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            System.out.println("===================================");
-            System.out.println(field.getName());
-            System.out.println(field.getType().toString());
-            field.setAccessible(true);
-            System.out.println(field.get(user));
-        }
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public Integer getTestType() {
-        return testType;
-    }
-
-    public void setTestType(Integer testType) {
-        this.testType = testType;
-    }
-
-    public Role getRole() {
-        return role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
-
-    public PhoneNumber getPhone() {
-        return phone;
-    }
-
-    public void setPhone(PhoneNumber phone) {
-        this.phone = phone;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    @Override
-    public String toString() {
-        return "User [id=" + id + ", name=" + name + ", age=" + age + ", price=" + price + ", testType=" + testType
-            + ", role=" + role + ", desc=" + desc + ", phone=" + phone + "]";
-    }
-}

部分文件因为文件数量过多而无法显示