admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: UpdateEntity 没有对 @Column(ignore = true) 的字段进行过滤 close #I7RE0J

Browse Source
This commit is contained in:
开源海哥 2023-08-23 18:15:30 +08:00
parent d4163a2f0f
commit f23cf43a45
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
View File

@ -748,11 +748,11 @@ public class CommonsDialectImpl implements IDialect {
StringJoiner stringJoiner = new StringJoiner(DELIMITER);
for (String modifyAttr : updateColumns) {
if (rawValueMap.containsKey(modifyAttr)) {
stringJoiner.add(wrap(modifyAttr) + EQUALS + rawValueMap.get(modifyAttr).toSql(this));
for (String updateColumn : updateColumns) {
if (rawValueMap.containsKey(updateColumn)) {
stringJoiner.add(wrap(updateColumn) + EQUALS + rawValueMap.get(updateColumn).toSql(this));
} else {
stringJoiner.add(wrap(modifyAttr) + EQUALS_PLACEHOLDER);
stringJoiner.add(wrap(updateColumn) + EQUALS_PLACEHOLDER);
}
}

24
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
View File

@ -362,7 +362,7 @@ public class TableInfo {
for (int i = 0; i < columnInfoList.size(); i++) {
ColumnInfo columnInfo = columnInfoList.get(i);
//真正的字段（没有做忽略标识）
if (!columnInfo.isIgnore()){
if (!columnInfo.isIgnore()) {
columnNames.add(columnInfo.column);
columnInfoMapping.put(columnInfo.column, columnInfo);
@ -521,6 +521,7 @@ public class TableInfo {
}
@SuppressWarnings({"unchecked", "rawtypes"})
public Map<String, RawValue> obtainUpdateRawValueMap(Object entity) {
if (!(entity instanceof UpdateWrapper)) {
return Collections.emptyMap();
@ -557,7 +558,13 @@ public class TableInfo {
return Collections.emptySet();
}
for (String property : updates.keySet()) {
String column = getColumnByProperty(property);
// String column = getColumnByProperty(property);
String column = propertyColumnMapping.get(property);
if (column == null) {
continue;
}
if (onUpdateColumns != null && onUpdateColumns.containsKey(column)) {
continue;
}
@ -628,12 +635,14 @@ public class TableInfo {
if (updates.isEmpty()) {
return FlexConsts.EMPTY_ARRAY;
}
// Set<String> properties = (Set<String>) updates;
// if (properties.isEmpty()) {
// return values.toArray();
// }
for (String property : updates.keySet()) {
String column = getColumnByProperty(property);
String column = propertyColumnMapping.get(property);
if (column == null) {
continue;
}
if (onUpdateColumns != null && onUpdateColumns.containsKey(column)) {
continue;
}
@ -718,6 +727,7 @@ public class TableInfo {
/**
* 获取主键值
*
* @param entity
* @return 主键值，有多个主键时返回数组
*/

17
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/AccountTester.java
View File

@ -157,6 +157,23 @@ public class AccountTester {
}
/**
* issues https://gitee.com/mybatis-flex/mybatis-flex/issues/I7RE0J
*/
@Test
public void testUpdateByUpdateWrapper() {
Account account = new Account();
account.setId(1L);
account = UpdateWrapper.of(account)
.set(Account::getId,1)
.set(Account::getAge, 20)
//设置 Ignore 字段，会被自动忽略
.setRaw(Account::getTitle, "xxxx")
.toEntity();
accountMapper.update(account);
}
@Test