-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4316e9e
commit 77ccb93
Showing
8 changed files
with
183 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,7 +61,8 @@ public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> mode | |
| .collect(toList()); | ||
| if (CollectionUtils.isNotEmpty(fieldInfos)) { | ||
| String sqlSet = "SET " + SqlScriptUtils.convertIf(fieldInfos.stream() | ||
| .map(i -> i.getSqlSet(EMPTY)).collect(joining(EMPTY)), "[email protected]@isSimpleType(_parameter.getClass())", true) | ||
| .map(i -> i.getSqlSet(EMPTY)).collect(joining(EMPTY)), | ||
| "@org.apache.ibatis.reflection.SystemMetaObject@forObject(_parameter).findProperty('" + tableInfo.getKeyProperty() + "', false) != null", true) | ||
| + tableInfo.getLogicDeleteSql(false, false); | ||
| sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), sqlSet, tableInfo.getKeyColumn(), | ||
| tableInfo.getKeyProperty(), tableInfo.getLogicDeleteSql(true, true)); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/DeleteByIdDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.baomidou.mybatisplus.test.uuid; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class DeleteByIdDto<T> implements Serializable { | ||
|
|
||
| private T id; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDLogicEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.baomidou.mybatisplus.test.uuid; | ||
|
|
||
| import com.baomidou.mybatisplus.annotation.*; | ||
| import lombok.Data; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| @Data | ||
| @TableName("entity") | ||
| public class UUIDLogicEntity { | ||
|
|
||
| @TableId(value = "id",type = IdType.INPUT) | ||
| private UUID id; | ||
|
|
||
| private String name; | ||
|
|
||
| @TableField(fill = FieldFill.UPDATE) | ||
| private String deleteBy; | ||
|
|
||
| @TableField(fill = FieldFill.UPDATE) | ||
| @TableLogic(delval = "true", value = "false") | ||
| private Boolean deleted; | ||
|
|
||
| } |
7 changes: 7 additions & 0 deletions
7
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDLogicEntityMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.baomidou.mybatisplus.test.uuid; | ||
|
|
||
| import com.baomidou.mybatisplus.core.mapper.BaseMapper; | ||
|
|
||
| public interface UUIDLogicEntityMapper extends BaseMapper<UUIDLogicEntity> { | ||
|
|
||
| } |
107 changes: 107 additions & 0 deletions
107
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDLogicEntityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package com.baomidou.mybatisplus.test.uuid; | ||
|
|
||
| import com.baomidou.mybatisplus.core.config.GlobalConfig; | ||
| import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; | ||
| import com.baomidou.mybatisplus.test.BaseDbTest; | ||
| import org.apache.ibatis.reflection.MetaObject; | ||
| import org.apache.ibatis.session.Configuration; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.UUID; | ||
| import java.util.function.Consumer; | ||
|
|
||
| public class UUIDLogicEntityTest extends BaseDbTest<UUIDLogicEntityMapper> { | ||
|
|
||
| @Test | ||
| void test() { | ||
| doTest(m -> { | ||
| var uuidEntity = new UUIDLogicEntity(); | ||
| uuidEntity.setId(UUID.randomUUID()); | ||
| uuidEntity.setName("test1"); | ||
| uuidEntity.setDeleted(false); | ||
| Assertions.assertEquals(1, m.insert(uuidEntity)); | ||
| Assertions.assertNotNull(m.selectById(uuidEntity.getId())); | ||
| Assertions.assertEquals(1, m.deleteById(uuidEntity)); | ||
| }); | ||
|
|
||
| doTest(m -> { | ||
| var uuidEntity = new UUIDLogicEntity(); | ||
| uuidEntity.setId(UUID.randomUUID()); | ||
| uuidEntity.setName("test2"); | ||
| uuidEntity.setDeleted(false); | ||
| Assertions.assertEquals(1, m.insert(uuidEntity)); | ||
| Assertions.assertEquals(1, m.deleteByIds(List.of(uuidEntity.getId()))); | ||
| }); | ||
|
|
||
| doTest(m -> { | ||
| var uuidEntity = new UUIDLogicEntity(); | ||
| uuidEntity.setId(UUID.randomUUID()); | ||
| uuidEntity.setName("test3"); | ||
| uuidEntity.setDeleted(false); | ||
| Assertions.assertEquals(1, m.insert(uuidEntity)); | ||
| Assertions.assertEquals(1, m.deleteByIds(List.of(uuidEntity))); | ||
| }); | ||
|
|
||
|
|
||
| doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteByIds( | ||
| List.of( | ||
| UUID.randomUUID().toString(), | ||
| UUID.randomUUID(), 123, 321L, | ||
| Map.of("id", UUID.randomUUID()), | ||
| Map.of("id", UUID.randomUUID().toString()), | ||
| new DeleteByIdDto<>(UUID.randomUUID()), | ||
| new DeleteByIdDto<>(UUID.randomUUID().toString()) | ||
| )))); | ||
|
|
||
| doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteById(UUID.randomUUID()))); | ||
| doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteById(new UUIDLogicEntity(){}))); | ||
| // TODO 下面三种类型无法转为UUID，看是否增加一个类型转换器让用户能注册处理自己的类型转换 | ||
| // doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteById(UUID.randomUUID().toString()))); | ||
| // doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteById(new DeleteByIdDto<>(UUID.randomUUID())))); | ||
| // doTest(m -> Assertions.assertDoesNotThrow(()-> m.deleteById(new DeleteByIdDto<>(UUID.randomUUID().toString())))); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| protected Consumer<Configuration> consumer() { | ||
| return configuration -> { | ||
| configuration.getTypeHandlerRegistry().register(UUIDTypeHandler.class); | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected GlobalConfig globalConfig() { | ||
| return super.globalConfig().setMetaObjectHandler(new MetaObjectHandler() { | ||
| @Override | ||
| public void insertFill(MetaObject metaObject) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void updateFill(MetaObject metaObject) { | ||
| metaObject.setValue("deleteBy", "baomidou"); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| protected String tableDataSql() { | ||
| return "insert into entity values('0824eb71-e124-5ba1-56b9-87185d91f309','test',null, false)"; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<String> tableSql() { | ||
| return Arrays.asList("drop table if exists entity", | ||
| "CREATE TABLE IF NOT EXISTS entity (\n" + | ||
| "id VARCHAR(50) NOT NULL,\n" + | ||
| "name VARCHAR(30) NULL DEFAULT NULL,\n" + | ||
| "delete_by VARCHAR(30) NULL DEFAULT NULL," + | ||
| "deleted BOOLEAN NOT NULL DEFAULT false," + | ||
| "PRIMARY KEY (id)" + | ||
| ")"); | ||
| } | ||
| } |