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

fix: https://gitee.com/mybatis-flex/mybatis-flex/issues/IAFGDE

Browse Source
This commit is contained in:
Michael Yang 2024-07-25 11:58:04 +08:00
parent ae5ca676e2
commit ed266ae235
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/RowKeyGenerator.java
View File

@ -32,9 +32,7 @@ import org.apache.ibatis.mapping.SqlSource;
import org.apache.ibatis.mapping.StatementType; import org.apache.ibatis.mapping.StatementType;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
/** /**
* 为 row 的主键生成器 * 为 row 的主键生成器
@ -45,7 +43,7 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
private final MappedStatement ms; private final MappedStatement ms;
private KeyGenerator[] keyGenerators; private KeyGenerator[] keyGenerators;
private List<String> autoKeyGeneratorNames; private Set<String> autoKeyGeneratorNames;
public RowKeyGenerator(MappedStatement methodMappedStatement) { public RowKeyGenerator(MappedStatement methodMappedStatement) {
this.ms = methodMappedStatement; this.ms = methodMappedStatement;
@ -53,8 +51,12 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
@Override @Override
public void processBefore(Executor executor, MappedStatement ms, Statement stmt, Object parameter) { public void processBefore(Executor executor, MappedStatement ms, Statement stmt, Object parameter) {
Row row = (Row) ((Map) parameter).get(FlexConsts.ROW); Row row = (Row) ((Map<?, ?>) parameter).get(FlexConsts.ROW);
keyGenerators = buildRowKeyGenerators(RowCPI.obtainsPrimaryKeys(row)); if (this.keyGenerators == null) {
this.keyGenerators = buildRowKeyGenerators(RowCPI.obtainsPrimaryKeys(row));
} else {
this.keyGenerators = new KeyGenerator[0];
}
for (KeyGenerator keyGenerator : keyGenerators) { for (KeyGenerator keyGenerator : keyGenerators) {
keyGenerator.processBefore(executor, ms, stmt, parameter); keyGenerator.processBefore(executor, ms, stmt, parameter);
} }
@ -88,12 +90,13 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
return NoKeyGenerator.INSTANCE; return NoKeyGenerator.INSTANCE;
} }
String keyColumn = rowKey.getKeyColumn();
if (rowKey.getKeyType() == KeyType.Auto) { if (rowKey.getKeyType() == KeyType.Auto) {
if (autoKeyGeneratorNames == null) { if (autoKeyGeneratorNames == null) {
autoKeyGeneratorNames = new ArrayList<>(); autoKeyGeneratorNames = new HashSet<>();
} }
autoKeyGeneratorNames.add(rowKey.getKeyColumn()); autoKeyGeneratorNames.add(keyColumn);
return new RowJdbc3KeyGenerator(rowKey.getKeyColumn()); return new RowJdbc3KeyGenerator(keyColumn);
} }
if (rowKey.getKeyType() == KeyType.Generator) { if (rowKey.getKeyType() == KeyType.Generator) {
@ -110,9 +113,9 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
.timeout(null) .timeout(null)
.statementType(StatementType.PREPARED) .statementType(StatementType.PREPARED)
.keyGenerator(NoKeyGenerator.INSTANCE) .keyGenerator(NoKeyGenerator.INSTANCE)
.keyProperty(FlexConsts.ROW + "." + rowKey.getKeyColumn()) .keyProperty(FlexConsts.ROW + "." + keyColumn)
// .keyColumn(FlexConsts.ROW + "." + rowKey.getKeyColumn()) // .keyColumn(FlexConsts.ROW + "." + rowKey.getKeyColumn())
.keyColumn(rowKey.getKeyColumn()) .keyColumn(keyColumn)
.databaseId(ms.getDatabaseId()) .databaseId(ms.getDatabaseId())
.lang(ms.getLang()) .lang(ms.getLang())
.resultOrdered(false) .resultOrdered(false)
@ -152,7 +155,7 @@ public class RowKeyGenerator implements KeyGenerator, IMultiKeyGenerator {
*/ */
@Override @Override
public String[] getKeyColumnNames() { public String[] getKeyColumnNames() {
return autoKeyGeneratorNames.toArray(new String[0]); return autoKeyGeneratorNames == null ? new String[0] : autoKeyGeneratorNames.toArray(new String[0]);
} }
} }