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

refactor: 修正属性 primaryKeys 应该为 Set 类型，主键也不可重复。

Browse Source
This commit is contained in:
Suomm 2023-07-23 08:57:20 +08:00
parent fa855c0b86
commit 7ff9d06b35
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,7 @@ 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.ArrayUtil; import com.mybatisflex.core.util.*;
import com.mybatisflex.core.util.ConvertUtil;
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;
@ -36,7 +33,7 @@ import java.util.*;
public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper { public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper {
//主键，多个主键用英文逗号隔开 //主键，多个主键用英文逗号隔开
private RowKey[] primaryKeys; private Set<RowKey> primaryKeys;
public static Row of(String key, Object value) { public static Row of(String key, Object value) {
Row row = new Row(); Row row = new Row();
@ -51,10 +48,10 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
public static Row ofKey(String primaryKey, Object value) { public static Row ofKey(String primaryKey, Object value) {
Row row = new Row(); Row row = new Row();
String[] primaryKeyStrings = primaryKey.split(","); String[] primaryKeyStrings = primaryKey.split(",");
row.primaryKeys = new RowKey[primaryKeyStrings.length]; row.primaryKeys = new HashSet<>(primaryKeyStrings.length);
for (int i = 0; i < primaryKeyStrings.length; i++) { for (String primaryKeyString : primaryKeyStrings) {
row.primaryKeys[i] = RowKey.of(primaryKeyStrings[i].trim()); row.primaryKeys.add(RowKey.of(primaryKeyString.trim()));
} }
if (primaryKeyStrings.length > 1 && !value.getClass().isArray()) { if (primaryKeyStrings.length > 1 && !value.getClass().isArray()) {
@ -74,14 +71,14 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
public static Row ofKey(RowKey... rowKeys) { public static Row ofKey(RowKey... rowKeys) {
Row row = new Row(); Row row = new Row();
row.primaryKeys = rowKeys; row.getPrimaryKeys().addAll(Arrays.asList(rowKeys));
return row; return row;
} }
public static Row ofKey(RowKey rowKey, Object value) { public static Row ofKey(RowKey rowKey, Object value) {
Row row = new Row(); Row row = new Row();
row.primaryKeys = new RowKey[]{rowKey}; row.getPrimaryKeys().add(rowKey);
row.put(rowKey.keyColumn, value); row.put(rowKey.keyColumn, value);
return row; return row;
} }
@ -89,7 +86,7 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
public static Row ofKey(RowKey[] rowKeys, Object[] value) { public static Row ofKey(RowKey[] rowKeys, Object[] value) {
Row row = new Row(); Row row = new Row();
row.primaryKeys = rowKeys; row.getPrimaryKeys().addAll(Arrays.asList(rowKeys));
for (int i = 0; i < rowKeys.length; i++) { for (int i = 0; i < rowKeys.length; i++) {
row.put(rowKeys[i].keyColumn, value[i]); row.put(rowKeys[i].keyColumn, value[i]);
} }
@ -328,11 +325,14 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
return ret; return ret;
} }
public RowKey[] getPrimaryKeys() { public Set<RowKey> getPrimaryKeys() {
if (primaryKeys == null) {
primaryKeys = new HashSet<>();
}
return primaryKeys; return primaryKeys;
} }
public void setPrimaryKeys(RowKey... primaryKeys) { public void setPrimaryKeys(Set<RowKey> primaryKeys) {
this.primaryKeys = primaryKeys; this.primaryKeys = primaryKeys;
} }
@ -347,7 +347,7 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
Set<String> getModifyAttrs() { Set<String> getModifyAttrs() {
int pkCount = primaryKeys != null ? primaryKeys.length : 0; int pkCount = primaryKeys != null ? primaryKeys.size() : 0;
if (pkCount == 0) { if (pkCount == 0) {
return keySet(); return keySet();
} }
@ -384,26 +384,29 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
String[] obtainsPrimaryKeyStrings() { String[] obtainsPrimaryKeyStrings() {
String[] returnKeys = new String[primaryKeys.length]; String[] returnKeys = new String[primaryKeys.size()];
for (int i = 0; i < primaryKeys.length; i++) { int index = 0;
returnKeys[i] = primaryKeys[i].keyColumn; for (RowKey primaryKey : primaryKeys) {
returnKeys[index++] = primaryKey.keyColumn;
} }
return returnKeys; return returnKeys;
} }
RowKey[] obtainsPrimaryKeys() { RowKey[] obtainsPrimaryKeys() {
return this.primaryKeys; return getPrimaryKeys().toArray(new RowKey[0]);
} }
Object[] obtainsPrimaryValues() { Object[] obtainsPrimaryValues() {
if (ArrayUtil.isEmpty(primaryKeys)) { if (CollectionUtil.isEmpty(primaryKeys)) {
return FlexConsts.EMPTY_ARRAY; return FlexConsts.EMPTY_ARRAY;
} }
Object[] values = new Object[primaryKeys.length]; Object[] values = new Object[primaryKeys.size()];
for (int i = 0; i < primaryKeys.length; i++) {
values[i] = get(primaryKeys[i].keyColumn); int index = 0;
for (RowKey primaryKey : primaryKeys) {
values[index++] = get(primaryKey.keyColumn);
} }
return values; return values;
} }
@ -415,7 +418,7 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper
private boolean isPk(String attr) { private boolean isPk(String attr) {
if (primaryKeys != null && primaryKeys.length > 0) { if (primaryKeys != null && !primaryKeys.isEmpty()) {
for (RowKey primaryKey : primaryKeys) { for (RowKey primaryKey : primaryKeys) {
if (primaryKey.keyColumn.equalsIgnoreCase(attr)) { if (primaryKey.keyColumn.equalsIgnoreCase(attr)) {
return true; return true;