[improve] support rewriteBatchedStatements=true (#6269)

baomidou · Jun 21, 2024 · ae237fb · ae237fb
1 parent 1cfc059
commit ae237fb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java
@@ -36,6 +36,7 @@
 import org.apache.ibatis.logging.LogFactory;
 
 import java.io.Serializable;
+import java.sql.Statement;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -88,7 +89,7 @@ public static <T> boolean saveBatch(Collection<T> entityList, int batchSize) {
  }
  Class<T> entityClass = getEntityClass(entityList);
  List<BatchResult> batchResults = SqlHelper.execute(entityClass, baseMapper -> baseMapper.insert(entityList, batchSize));
- return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0);
+ return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0 || i == Statement.SUCCESS_NO_INFO);
  }
 
  /**
@@ -112,7 +113,7 @@ public static <T> boolean saveOrUpdateBatch(Collection<T> entityList, int batchS
  }
  Class<T> entityClass = getEntityClass(entityList);
  List<BatchResult> batchResults = SqlHelper.execute(entityClass, baseMapper -> baseMapper.insertOrUpdate(entityList, batchSize));
- return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0);
+ return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0 || i == Statement.SUCCESS_NO_INFO);
  }
 
  /**
@@ -195,7 +196,7 @@ public static <T> boolean updateBatchById(Collection<T> entityList) {
  public static <T> boolean updateBatchById(Collection<T> entityList, int batchSize) {
  Class<T> entityClass = getEntityClass(entityList);
  List<BatchResult> batchResults = SqlHelper.execute(entityClass, baseMapper -> baseMapper.updateById(entityList, batchSize));
- return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0);
+ return batchResults.stream().flatMapToInt(r -> IntStream.of(r.getUpdateCounts())).allMatch(i -> i > 0 || i == Statement.SUCCESS_NO_INFO);
  }
 
  /**