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

fix: Db + Row 支持原生 SQL 构建。

Browse Source
This commit is contained in:
Suomm 2024-04-02 15:14:04 +08:00
parent 99cdd0e0e6
commit 9a36cff0d8
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Row.java
View File

@ -21,14 +21,29 @@ import com.mybatisflex.core.query.QueryCondition;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.RawValue; import com.mybatisflex.core.update.RawValue;
import com.mybatisflex.core.update.UpdateWrapper; import com.mybatisflex.core.update.UpdateWrapper;
import com.mybatisflex.core.util.*; import com.mybatisflex.core.util.ArrayUtil;
import com.mybatisflex.core.util.CollectionUtil;
import com.mybatisflex.core.util.ConvertUtil;
import com.mybatisflex.core.util.LambdaGetter;
import com.mybatisflex.core.util.LambdaUtil;
import com.mybatisflex.core.util.SqlUtil;
import com.mybatisflex.core.util.StringUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.sql.Time; import java.sql.Time;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -509,7 +524,12 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper<
List<Object> values = new ArrayList<>(); List<Object> values = new ArrayList<>();
for (String key : keySet()) { for (String key : keySet()) {
Object value = get(key); Object value = get(key);
if (!isPk(key) && !(value instanceof RawValue)) { if (isPk(key)) {
continue;
}
if (value instanceof RawValue) {
values.addAll(Arrays.asList(((RawValue) value).getParams()));
} else {
values.add(value); values.add(value);
} }
} }
@ -569,7 +589,12 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper<
for (String key : keySet()) { for (String key : keySet()) {
Object value = get(key); Object value = get(key);
if (!isPk(key) && !(value instanceof RawValue)) { if (isPk(key)) {
continue;
}
if (value instanceof RawValue) {
values.addAll(Arrays.asList(((RawValue) value).getParams()));
} else {
values.add(value); values.add(value);
} }
} }