Merge branch 'dev'

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/CreateDB.sql

@@ -6,6 +6,7 @@ CREATE TABLE version_user (
 	NAME VARCHAR (20),
 	age INT (11),
 	version INT (11),
+	isDelete INT (11) DEFAULT 0,
 	PRIMARY KEY (`id`)
 ) ENGINE = INNODB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/OptimisticLockerInterceptorTest.java

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.StringVersi
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.TimestampVersionUser;
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.DateVersionUserMapper;
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.IntVersionUserMapper;
+import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.LogicVersionUserMapper;
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.LongVersionUserMapper;
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.StringVersionUserMapper;
 import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.TimestampVersionUserMapper;
@@ -46,6 +47,8 @@ public class OptimisticLockerInterceptorTest {
 	@Autowired
 	private StringVersionUserMapper stringersionUserMapper;
 	@Autowired
+	private LogicVersionUserMapper logicVersionUserMapper;
+	@Autowired
 	private SqlSessionTemplate sqlSessionTemplate;
 
 	@Before
@@ -194,6 +197,10 @@ public class OptimisticLockerInterceptorTest {
 		wrapper2.setVersion(originVersion + 1);
 		intVersionUserMapper.update(versionUser, new EntityWrapper<>(wrapper2));
 		Assert.assertTrue(intVersionUserMapper.selectById(1).getVersion() == originVersion + 1);
+	}
 
+	@Test // FIXME这个测试应该归属逻辑删除里
+	public void runWithDeleteLogicTest() {
+		logicVersionUserMapper.deleteById(1L);
 	}
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/LogicVersionUser.java

@@ -0,0 +1,58 @@
+package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableLogic;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+@TableName("version_user")
+public class LogicVersionUser implements Serializable {
+
+	@TableField(exist = false)
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+
+	private String name;
+
+	@Version
+	private Short version;
+	
+	@TableLogic(value = "0", delval = "1")
+	private Integer isDelete;
+
+	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 Short getVersion() {
+		return version;
+	}
+
+	public void setVersion(Short version) {
+		this.version = version;
+	}
+
+	public Integer getIsDelete() {
+		return isDelete;
+	}
+
+	public void setIsDelete(Integer isDelete) {
+		this.isDelete = isDelete;
+	}
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/ShortVersionUser.java

@@ -1,46 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
-
-@TableName("version_user")
-public class ShortVersionUser implements Serializable {
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    private String name;
-
-    @Version
-    private Short version;
-
-    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 Short getVersion() {
-        return version;
-    }
-
-    public void setVersion(Short version) {
-        this.version = version;
-    }
-
-}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/LogicVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.LogicVersionUser;
+
+public interface LogicVersionUserMapper extends BaseMapper<LogicVersionUser> {
+
+}

mybatis-plus/src/test/resources/plugins/optimisticLockerInterceptor.xml

@@ -7,7 +7,8 @@
            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd  
            http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
-	<context:component-scan base-package="com.baomidou.mybatisplus.test.plugins.optimisticLocker" />
+	<context:component-scan
+		base-package="com.baomidou.mybatisplus.test.plugins.optimisticLocker" />
 
 	<import resource="classpath:h2/spring-jdbc.xml" />
 
@@ -39,4 +40,10 @@
 		<property name="basePackage"
 			value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper" />
 	</bean>
+
+	<bean id="globalConfig" class="com.baomidou.mybatisplus.entity.GlobalConfiguration">
+		<property name="sqlInjector" ref="mySqlInjector" />
+	</bean>
+
+	<bean id="mySqlInjector" class="com.baomidou.mybatisplus.mapper.LogicSqlInjector" />
 </beans>