fields = CollUtil.filter(entities[0].keySet(), StrUtil::isNotBlank);
+ return StatementUtil.prepareStatementForBatch(conn, insert.build(), fields, entities);
}
@Override
@@ -113,7 +116,7 @@ public class AnsiSqlDialect implements Dialect {
/**
* 根据不同数据库在查询SQL语句基础上包装其分页的语句
* 各自数据库通过重写此方法实现最小改动情况下修改分页语句
- *
+ *
* @param find 标准查询语句
* @param page 分页对象
* @return 分页语句
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
index 96311bb0f..110aea5f6 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
@@ -1,9 +1,18 @@
package cn.hutool.db.dialect.impl;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.Entity;
import cn.hutool.db.Page;
+import cn.hutool.db.StatementUtil;
import cn.hutool.db.dialect.DialectName;
import cn.hutool.db.sql.SqlBuilder;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
/**
* H2数据库方言
*
@@ -26,4 +35,43 @@ public class H2Dialect extends AnsiSqlDialect {
// limit A , B 表示：A就是查询的起点位置，B就是你需要多少行。
return find.append(" limit ").append(page.getStartPosition()).append(" , ").append(page.getPageSize());
}
+
+ @Override
+ public PreparedStatement psForUpsert(Connection conn, Entity entity, String... keys) throws SQLException {
+ Assert.notEmpty(keys, "Keys must be not empty for H2 MERGE SQL.");
+ SqlBuilder.validateEntity(entity);
+ final SqlBuilder builder = SqlBuilder.create(wrapper);
+
+ final StringBuilder fieldsPart = new StringBuilder();
+ final StringBuilder placeHolder = new StringBuilder();
+
+ // 构建字段部分和参数占位符部分
+ entity.forEach((field, value)->{
+ if (StrUtil.isNotBlank(field)) {
+ if (fieldsPart.length() > 0) {
+ // 非第一个参数，追加逗号
+ fieldsPart.append(", ");
+ placeHolder.append(", ");
+ }
+
+ fieldsPart.append((null != wrapper) ? wrapper.wrap(field) : field);
+ placeHolder.append("?");
+ builder.addParams(value);
+ }
+ });
+
+ String tableName = entity.getTableName();
+ if (null != this.wrapper) {
+ tableName = this.wrapper.wrap(tableName);
+ }
+ builder.append("MERGE INTO ").append(tableName)
+ // 字段列表
+ .append(" (").append(fieldsPart)
+ // 更新关键字列表
+ .append(") KEY(").append(ArrayUtil.join(keys, ", "))
+ // 更新值列表
+ .append(") VALUES (").append(placeHolder).append(")");
+
+ return StatementUtil.prepareStatement(conn, builder);
+ }
}
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
index d10e811fb..a52cfa759 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
@@ -1,10 +1,17 @@
package cn.hutool.db.dialect.impl;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.Entity;
import cn.hutool.db.Page;
+import cn.hutool.db.StatementUtil;
import cn.hutool.db.dialect.DialectName;
import cn.hutool.db.sql.SqlBuilder;
import cn.hutool.db.sql.Wrapper;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
/**
* MySQL方言
* @author loolly
@@ -21,9 +28,65 @@ public class MysqlDialect extends AnsiSqlDialect{
protected SqlBuilder wrapPageSql(SqlBuilder find, Page page) {
return find.append(" LIMIT ").append(page.getStartPosition()).append(", ").append(page.getPageSize());
}
-
+
@Override
public String dialectName() {
return DialectName.MYSQL.toString();
}
+
+ /**
+ * 构建用于upsert的{@link PreparedStatement}
+ * MySQL通过主键方式实现Upsert，故keys无效，生成SQL语法为：
+ *
+ * INSERT INTO demo(a,b,c) values(?, ?, ?) ON DUPLICATE KEY UPDATE a=values(a), b=values(b), c=values(c);
+ *
+ *
+ * @param conn 数据库连接对象
+ * @param entity 数据实体类（包含表名）
+ * @param keys 此参数无效
+ * @return PreparedStatement
+ * @throws SQLException SQL执行异常
+ * @since 5.7.20
+ */
+ @Override
+ public PreparedStatement psForUpsert(Connection conn, Entity entity, String... keys) throws SQLException {
+ SqlBuilder.validateEntity(entity);
+ final SqlBuilder builder = SqlBuilder.create(wrapper);
+
+ final StringBuilder fieldsPart = new StringBuilder();
+ final StringBuilder placeHolder = new StringBuilder();
+ final StringBuilder updateHolder = new StringBuilder();
+
+ // 构建字段部分和参数占位符部分
+ entity.forEach((field, value)->{
+ if (StrUtil.isNotBlank(field)) {
+ if (fieldsPart.length() > 0) {
+ // 非第一个参数，追加逗号
+ fieldsPart.append(", ");
+ placeHolder.append(", ");
+ updateHolder.append(", ");
+ }
+
+ field = (null != wrapper) ? wrapper.wrap(field) : field;
+ fieldsPart.append(field);
+ updateHolder.append(field).append("=values(").append(field).append(")");
+ placeHolder.append("?");
+ builder.addParams(value);
+ }
+ });
+
+ String tableName = entity.getTableName();
+ if (null != this.wrapper) {
+ tableName = this.wrapper.wrap(tableName);
+ }
+ builder.append("INSERT INTO ").append(tableName)
+ // 字段列表
+ .append(" (").append(fieldsPart)
+ // 更新值列表
+ .append(") VALUES (").append(placeHolder)
+ // 主键冲突后的更新操作
+ .append(") ON DUPLICATE KEY UPDATE ").append(updateHolder);
+
+ return StatementUtil.prepareStatement(conn, builder);
+ }
}
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
index 925889611..037aaf8a0 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
@@ -1,32 +1,44 @@
package cn.hutool.db.dialect.impl;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Page;
import cn.hutool.db.dialect.DialectName;
import cn.hutool.db.sql.SqlBuilder;
/**
* Oracle 方言
- * @author loolly
*
+ * @author loolly
*/
-public class OracleDialect extends AnsiSqlDialect{
+public class OracleDialect extends AnsiSqlDialect {
private static final long serialVersionUID = 6122761762247483015L;
+ /**
+ * 检查字段值是否为Oracle自增字段，自增字段以`.nextval`结尾
+ *
+ * @param value 检查的字段值
+ * @return 是否为Oracle自增字段
+ * @since 5.7.20
+ */
+ public static boolean isNextVal(Object value) {
+ return (value instanceof CharSequence) && StrUtil.endWithIgnoreCase(value.toString(), ".nextval");
+ }
+
public OracleDialect() {
//Oracle所有字段名用双引号包围，防止字段名或表名与系统关键字冲突
//wrapper = new Wrapper('"');
}
-
+
@Override
protected SqlBuilder wrapPageSql(SqlBuilder find, Page page) {
final int[] startEnd = page.getStartEnd();
return find
- .insertPreFragment("SELECT * FROM ( SELECT row_.*, rownum rownum_ from ( ")
- .append(" ) row_ where rownum <= ").append(startEnd[1])//
- .append(") table_alias")//
- .append(" where table_alias.rownum_ > ").append(startEnd[0]);//
+ .insertPreFragment("SELECT * FROM ( SELECT row_.*, rownum rownum_ from ( ")
+ .append(" ) row_ where rownum <= ").append(startEnd[1])//
+ .append(") table_alias")//
+ .append(" where table_alias.rownum_ > ").append(startEnd[0]);//
}
-
+
@Override
public String dialectName() {
return DialectName.ORACLE.name();
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java
index c2ad5bdd5..8064e8982 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PhoenixDialect.java
@@ -24,6 +24,7 @@ public class PhoenixDialect extends AnsiSqlDialect {
@Override
public PreparedStatement psForUpdate(Connection conn, Entity entity, Query query) throws SQLException {
// Phoenix的插入、更新语句是统一的，统一使用upsert into关键字
+ // Phoenix只支持通过主键更新操作，因此query无效，自动根据entity中的主键更新
return super.psForInsert(conn, entity);
}
@@ -31,4 +32,10 @@ public class PhoenixDialect extends AnsiSqlDialect {
public String dialectName() {
return DialectName.PHOENIX.name();
}
+
+ @Override
+ public PreparedStatement psForUpsert(Connection conn, Entity entity, String... keys) throws SQLException {
+ // Phoenix只支持通过主键更新操作，因此query无效，自动根据entity中的主键更新
+ return psForInsert(conn, entity);
+ }
}
diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
index d7109e3c2..1f5a90122 100644
--- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
+++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
@@ -1,8 +1,18 @@
package cn.hutool.db.dialect.impl;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.db.Entity;
+import cn.hutool.db.StatementUtil;
import cn.hutool.db.dialect.DialectName;
+import cn.hutool.db.sql.SqlBuilder;
import cn.hutool.db.sql.Wrapper;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
/**
* Postgree方言
@@ -20,4 +30,49 @@ public class PostgresqlDialect extends AnsiSqlDialect{
public String dialectName() {
return DialectName.POSTGREESQL.name();
}
+
+ @Override
+ public PreparedStatement psForUpsert(Connection conn, Entity entity, String... keys) throws SQLException {
+ Assert.notEmpty(keys, "Keys must be not empty for Postgres.");
+ SqlBuilder.validateEntity(entity);
+ final SqlBuilder builder = SqlBuilder.create(wrapper);
+
+ final StringBuilder fieldsPart = new StringBuilder();
+ final StringBuilder placeHolder = new StringBuilder();
+ final StringBuilder updateHolder = new StringBuilder();
+
+ // 构建字段部分和参数占位符部分
+ entity.forEach((field, value)->{
+ if (StrUtil.isNotBlank(field)) {
+ if (fieldsPart.length() > 0) {
+ // 非第一个参数，追加逗号
+ fieldsPart.append(", ");
+ placeHolder.append(", ");
+ updateHolder.append(", ");
+ }
+
+ final String wrapedField = (null != wrapper) ? wrapper.wrap(field) : field;
+ fieldsPart.append(wrapedField);
+ updateHolder.append(wrapedField).append("=EXCLUDED.").append(field);
+ placeHolder.append("?");
+ builder.addParams(value);
+ }
+ });
+
+ String tableName = entity.getTableName();
+ if (null != this.wrapper) {
+ tableName = this.wrapper.wrap(tableName);
+ }
+ builder.append("INSERT INTO ").append(tableName)
+ // 字段列表
+ .append(" (").append(fieldsPart)
+ // 更新值列表
+ .append(") VALUES (").append(placeHolder)
+ // 定义检查冲突的主键或字段
+ .append(") ON CONFLICT (").append(ArrayUtil.join(keys,", "))
+ // 主键冲突后的更新操作
+ .append(") DO UPDATE SET ").append(updateHolder);
+
+ return StatementUtil.prepareStatement(conn, builder);
+ }
}
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
index 95d15ed8a..a2a52634d 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
@@ -7,13 +7,13 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.Entity;
import cn.hutool.db.dialect.DialectName;
+import cn.hutool.db.dialect.impl.OracleDialect;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Map.Entry;
/**
* SQL构建器
@@ -57,6 +57,24 @@ public class SqlBuilder implements Builder {
return create().append(sql);
}
+ /**
+ * 验证实体类对象的有效性
+ *
+ * @param entity 实体类对象
+ * @throws DbRuntimeException SQL异常包装，获取元数据信息失败
+ */
+ public static void validateEntity(Entity entity) throws DbRuntimeException {
+ if (null == entity) {
+ throw new DbRuntimeException("Entity is null !");
+ }
+ if (StrUtil.isBlank(entity.getTableName())) {
+ throw new DbRuntimeException("Entity`s table name is null !");
+ }
+ if (entity.isEmpty()) {
+ throw new DbRuntimeException("No filed and value in this entity !");
+ }
+ }
+
// --------------------------------------------------------------- Static methods end
// --------------------------------------------------------------- Enums start
@@ -87,10 +105,6 @@ public class SqlBuilder implements Builder {
// --------------------------------------------------------------- Enums end
private final StringBuilder sql = new StringBuilder();
- /**
- * 字段列表（仅用于插入和更新）
- */
- private final List fields = new ArrayList<>();
/**
* 占位符对应的值列表
*/
@@ -146,41 +160,29 @@ public class SqlBuilder implements Builder {
// 验证
validateEntity(entity);
- if (null != wrapper) {
- // 包装表名 entity = wrapper.wrap(entity);
- entity.setTableName(wrapper.wrap(entity.getTableName()));
- }
-
final boolean isOracle = DialectName.ORACLE.match(dialectName);// 对Oracle的特殊处理
final StringBuilder fieldsPart = new StringBuilder();
final StringBuilder placeHolder = new StringBuilder();
- boolean isFirst = true;
- String field;
- Object value;
- for (Entry entry : entity.entrySet()) {
- field = entry.getKey();
- value = entry.getValue();
- if (StrUtil.isNotBlank(field) /* && null != value */) {
- if (isFirst) {
- isFirst = false;
- } else {
+ entity.forEach((field, value) -> {
+ if (StrUtil.isNotBlank(field)) {
+ if (fieldsPart.length() > 0) {
// 非第一个参数，追加逗号
fieldsPart.append(", ");
placeHolder.append(", ");
}
- this.fields.add(field);
fieldsPart.append((null != wrapper) ? wrapper.wrap(field) : field);
- if (isOracle && value instanceof String && StrUtil.endWithIgnoreCase((String) value, ".nextval")) {
+ if (isOracle && OracleDialect.isNextVal(value)) {
// Oracle的特殊自增键，通过字段名.nextval获得下一个值
placeHolder.append(value);
} else {
+ // 普通字段使用占位符
placeHolder.append("?");
this.paramValues.add(value);
}
}
- }
+ });
// issue#1656@Github Phoenix兼容
if (DialectName.PHOENIX.match(dialectName)) {
@@ -189,7 +191,12 @@ public class SqlBuilder implements Builder {
sql.append("INSERT INTO ");
}
- sql.append(entity.getTableName())
+ String tableName = entity.getTableName();
+ if (null != this.wrapper) {
+ // 包装表名 entity = wrapper.wrap(entity);
+ tableName = this.wrapper.wrap(tableName);
+ }
+ sql.append(tableName)
.append(" (").append(fieldsPart).append(") VALUES (")//
.append(placeHolder).append(")");
@@ -227,26 +234,22 @@ public class SqlBuilder implements Builder {
// 验证
validateEntity(entity);
+ String tableName = entity.getTableName();
if (null != wrapper) {
// 包装表名
- // entity = wrapper.wrap(entity);
- entity.setTableName(wrapper.wrap(entity.getTableName()));
+ tableName = wrapper.wrap(tableName);
}
- sql.append("UPDATE ").append(entity.getTableName()).append(" SET ");
- String field;
- for (Entry entry : entity.entrySet()) {
- field = entry.getKey();
+ sql.append("UPDATE ").append(tableName).append(" SET ");
+ entity.forEach((field, value) -> {
if (StrUtil.isNotBlank(field)) {
if (paramValues.size() > 0) {
sql.append(", ");
}
- this.fields.add(field);
sql.append((null != wrapper) ? wrapper.wrap(field) : field).append(" = ? ");
- this.paramValues.add(entry.getValue());// 更新不对空做处理，因为存在清空字段的情况
+ this.paramValues.add(value);// 更新不对空做处理，因为存在清空字段的情况
}
- }
-
+ });
return this;
}
@@ -573,24 +576,6 @@ public class SqlBuilder implements Builder {
}
// --------------------------------------------------------------- Builder end
- /**
- * 获得插入或更新的数据库字段列表
- *
- * @return 插入或更新的数据库字段列表
- */
- public String[] getFieldArray() {
- return this.fields.toArray(new String[0]);
- }
-
- /**
- * 获得插入或更新的数据库字段列表
- *
- * @return 插入或更新的数据库字段列表
- */
- public List getFields() {
- return this.fields;
- }
-
/**
* 获得占位符对应的值列表
*
@@ -645,23 +630,5 @@ public class SqlBuilder implements Builder {
return ConditionBuilder.of(conditions).build(this.paramValues);
}
-
- /**
- * 验证实体类对象的有效性
- *
- * @param entity 实体类对象
- * @throws DbRuntimeException SQL异常包装，获取元数据信息失败
- */
- private static void validateEntity(Entity entity) throws DbRuntimeException {
- if (null == entity) {
- throw new DbRuntimeException("Entity is null !");
- }
- if (StrUtil.isBlank(entity.getTableName())) {
- throw new DbRuntimeException("Entity`s table name is null !");
- }
- if (entity.isEmpty()) {
- throw new DbRuntimeException("No filed and value in this entity !");
- }
- }
// --------------------------------------------------------------- private method end
}
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
index fd823804e..8851b2eac 100644
--- a/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
+++ b/hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Entity;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map.Entry;
@@ -14,14 +15,19 @@ import java.util.Map.Entry;
/**
* 包装器
* 主要用于字段名的包装（在字段名的前后加字符，例如反引号来避免与数据库的关键字冲突）
- * @author Looly
*
+ * @author Looly
*/
-public class Wrapper {
+public class Wrapper implements Serializable {
+ private static final long serialVersionUID = 1L;
- /** 前置包装符号 */
+ /**
+ * 前置包装符号
+ */
private Character preWrapQuote;
- /** 后置包装符号 */
+ /**
+ * 后置包装符号
+ */
private Character sufWrapQuote;
public Wrapper() {
@@ -29,6 +35,7 @@ public class Wrapper {
/**
* 构造
+ *
* @param wrapQuote 单包装字符
*/
public Wrapper(Character wrapQuote) {
@@ -38,6 +45,7 @@ public class Wrapper {
/**
* 包装符号
+ *
* @param preWrapQuote 前置包装符号
* @param sufWrapQuote 后置包装符号
*/
@@ -47,14 +55,17 @@ public class Wrapper {
}
//--------------------------------------------------------------- Getters and Setters start
+
/**
* @return 前置包装符号
*/
public char getPreWrapQuote() {
return preWrapQuote;
}
+
/**
* 设置前置包装的符号
+ *
* @param preWrapQuote 前置包装符号
*/
public void setPreWrapQuote(Character preWrapQuote) {
@@ -67,8 +78,10 @@ public class Wrapper {
public char getSufWrapQuote() {
return sufWrapQuote;
}
+
/**
* 设置后置包装的符号
+ *
* @param sufWrapQuote 后置包装符号
*/
public void setSufWrapQuote(Character sufWrapQuote) {
@@ -79,26 +92,27 @@ public class Wrapper {
/**
* 包装字段名
* 有时字段与SQL的某些关键字冲突，导致SQL出错，因此需要将字段名用单引号或者反引号包装起来，避免冲突
+ *
* @param field 字段名
* @return 包装后的字段名
*/
- public String wrap(String field){
- if(preWrapQuote == null || sufWrapQuote == null || StrUtil.isBlank(field)) {
+ public String wrap(String field) {
+ if (preWrapQuote == null || sufWrapQuote == null || StrUtil.isBlank(field)) {
return field;
}
//如果已经包含包装的引号，返回原字符
- if(StrUtil.isSurround(field, preWrapQuote, sufWrapQuote)){
+ if (StrUtil.isSurround(field, preWrapQuote, sufWrapQuote)) {
return field;
}
//如果字段中包含通配符或者括号（字段通配符或者函数），不做包装
- if(StrUtil.containsAnyIgnoreCase(field, "*", "(", " ", " as ")) {
+ if (StrUtil.containsAnyIgnoreCase(field, "*", "(", " ", " as ")) {
return field;
}
//对于Oracle这类数据库，表名中包含用户名需要单独拆分包装
- if(field.contains(StrUtil.DOT)){
+ if (field.contains(StrUtil.DOT)) {
final Collection target = CollUtil.edit(StrUtil.split(field, CharUtil.DOT, 2), t -> StrUtil.format("{}{}{}", preWrapQuote, t, sufWrapQuote));
return CollectionUtil.join(target, StrUtil.DOT);
}
@@ -109,16 +123,17 @@ public class Wrapper {
/**
* 包装字段名
* 有时字段与SQL的某些关键字冲突，导致SQL出错，因此需要将字段名用单引号或者反引号包装起来，避免冲突
+ *
* @param fields 字段名
* @return 包装后的字段名
*/
- public String[] wrap(String... fields){
- if(ArrayUtil.isEmpty(fields)) {
+ public String[] wrap(String... fields) {
+ if (ArrayUtil.isEmpty(fields)) {
return fields;
}
String[] wrappedFields = new String[fields.length];
- for(int i = 0; i < fields.length; i++) {
+ for (int i = 0; i < fields.length; i++) {
wrappedFields[i] = wrap(fields[i]);
}
@@ -128,11 +143,12 @@ public class Wrapper {
/**
* 包装字段名
* 有时字段与SQL的某些关键字冲突，导致SQL出错，因此需要将字段名用单引号或者反引号包装起来，避免冲突
+ *
* @param fields 字段名
* @return 包装后的字段名
*/
- public Collection wrap(Collection fields){
- if(CollectionUtil.isEmpty(fields)) {
+ public Collection wrap(Collection fields) {
+ if (CollectionUtil.isEmpty(fields)) {
return fields;
}
@@ -140,13 +156,14 @@ public class Wrapper {
}
/**
- * 包装字段名
+ * 包装表名和字段名，此方法返回一个新的Entity实体类
* 有时字段与SQL的某些关键字冲突，导致SQL出错，因此需要将字段名用单引号或者反引号包装起来，避免冲突
+ *
* @param entity 被包装的实体
- * @return 包装后的字段名
+ * @return 新的实体
*/
- public Entity wrap(Entity entity){
- if(null == entity) {
+ public Entity wrap(Entity entity) {
+ if (null == entity) {
return null;
}
@@ -166,14 +183,15 @@ public class Wrapper {
/**
* 包装字段名
* 有时字段与SQL的某些关键字冲突，导致SQL出错，因此需要将字段名用单引号或者反引号包装起来，避免冲突
+ *
* @param conditions 被包装的实体
* @return 包装后的字段名
*/
- public Condition[] wrap(Condition... conditions){
+ public Condition[] wrap(Condition... conditions) {
final Condition[] clonedConditions = new Condition[conditions.length];
- if(ArrayUtil.isNotEmpty(conditions)) {
+ if (ArrayUtil.isNotEmpty(conditions)) {
Condition clonedCondition;
- for(int i = 0; i < conditions.length; i++) {
+ for (int i = 0; i < conditions.length; i++) {
clonedCondition = conditions[i].clone();
clonedCondition.setField(wrap(clonedCondition.getField()));
clonedConditions[i] = clonedCondition;
diff --git a/hutool-db/src/test/java/cn/hutool/db/H2Test.java b/hutool-db/src/test/java/cn/hutool/db/H2Test.java
index c61404527..bc7e48dd7 100644
--- a/hutool-db/src/test/java/cn/hutool/db/H2Test.java
+++ b/hutool-db/src/test/java/cn/hutool/db/H2Test.java
@@ -9,14 +9,14 @@ import java.util.List;
/**
* H2数据库单元测试
- *
+ *
* @author looly
*
*/
public class H2Test {
-
+
private static final String DS_GROUP_NAME = "h2";
-
+
@BeforeClass
public static void init() throws SQLException {
Db db = Db.use(DS_GROUP_NAME);
@@ -27,7 +27,7 @@ public class H2Test {
db.insert(Entity.create("test").set("a", 3).set("b", 31));
db.insert(Entity.create("test").set("a", 4).set("b", 41));
}
-
+
@Test
public void queryTest() throws SQLException {
List query = Db.use(DS_GROUP_NAME).query("select * from test");
@@ -39,4 +39,12 @@ public class H2Test {
List query = Db.use(DS_GROUP_NAME).find(Entity.create("test"));
Assert.assertEquals(4, query.size());
}
+
+ @Test
+ public void upsertTest() throws SQLException {
+ Db db=Db.use(DS_GROUP_NAME);
+ db.upsert(Entity.create("test").set("a",1).set("b",111),"a");
+ Entity a1=db.get("test","a",1);
+ Assert.assertEquals(Long.valueOf(111),a1.getLong("b"));
+ }
}
diff --git a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
index e3e72fba1..8ecebb74e 100644
--- a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
@@ -1,6 +1,9 @@
package cn.hutool.db;
import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.ArrayUtil;
+import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -9,11 +12,16 @@ import java.util.List;
/**
* MySQL操作单元测试
- *
- * @author looly
*
+ * @author looly
*/
public class MySQLTest {
+ @BeforeClass
+ @Ignore
+ public static void createTable() throws SQLException {
+ Db db = Db.use("mysql");
+ db.executeBatch("drop table if exists testuser", "CREATE TABLE if not exists `testuser` ( `id` int(11) NOT NULL, `account` varchar(255) DEFAULT NULL, `pass` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+ }
@Test
@Ignore
@@ -34,13 +42,13 @@ public class MySQLTest {
*
* @throws SQLException SQL异常
*/
- @Test(expected=SQLException.class)
+ @Test(expected = SQLException.class)
@Ignore
public void txTest() throws SQLException {
Db.use("mysql").tx(db -> {
int update = db.update(Entity.create("user").set("text", "描述100"), Entity.create().set("id", 100));
db.update(Entity.create("user").set("text", "描述101"), Entity.create().set("id", 101));
- if(1 == update) {
+ if (1 == update) {
// 手动指定异常，然后测试回滚触发
throw new RuntimeException("Error");
}
@@ -64,4 +72,14 @@ public class MySQLTest {
Console.log(all);
}
+ @Test
+ @Ignore
+ public void upsertTest() throws SQLException {
+ Db db = Db.use("mysql");
+ db.insert(Entity.create("testuser").set("id", 1).set("account", "ice").set("pass", "123456"));
+ db.upsert(Entity.create("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456"));
+ Entity user = db.get(Entity.create("testuser").set("id", 1));
+ System.out.println("user======="+user.getStr("account")+"___"+user.getStr("pass"));
+ Assert.assertEquals(user.getStr("account"), new String("icefairy"));
+ }
}
diff --git a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java b/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
index a19559a7e..250930efe 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
@@ -2,6 +2,7 @@ package cn.hutool.db;
import java.sql.SQLException;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -9,9 +10,8 @@ import cn.hutool.core.lang.Console;
/**
* PostgreSQL 单元测试
- *
- * @author looly
*
+ * @author looly
*/
public class PostgreTest {
@@ -34,4 +34,16 @@ public class PostgreTest {
Console.log(entity.get("id"));
}
}
+
+ @Test
+ @Ignore
+ public void upsertTest() throws SQLException {
+ Db db = Db.use("postgre");
+ db.executeBatch("drop table if exists ctest",
+ "create table if not exists \"ctest\" ( \"id\" serial4, \"t1\" varchar(255) COLLATE \"pg_catalog\".\"default\", \"t2\" varchar(255) COLLATE \"pg_catalog\".\"default\", \"t3\" varchar(255) COLLATE \"pg_catalog\".\"default\", CONSTRAINT \"ctest_pkey\" PRIMARY KEY (\"id\") ) ");
+ db.insert(Entity.create("ctest").set("id", 1).set("t1", "111").set("t2", "222").set("t3", "333"));
+ db.upsert(Entity.create("ctest").set("id", 1).set("t1", "new111").set("t2", "new222").set("t3", "bew333"),"id");
+ Entity et=db.get(Entity.create("ctest").set("id", 1));
+ Assert.assertEquals("new111",et.getStr("t1"));
+ }
}
diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml
index 183c0eff9..244b9c3fe 100644
--- a/hutool-dfa/pom.xml
+++ b/hutool-dfa/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-dfa
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 7fca763ac..0a6a57284 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-extra
diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml
index a27a4ac72..b4a57da4c 100644
--- a/hutool-http/pom.xml
+++ b/hutool-http/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-http
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java b/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
index 918085592..99f28b1e1 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpGlobalConfig.java
@@ -32,6 +32,7 @@ public class HttpGlobalConfig implements Serializable {
private static boolean isAllowPatch = false;
private static String boundary = "--------------------Hutool_" + RandomUtil.randomString(16);
private static int maxRedirectCount = 0;
+ private static boolean ignoreEOFError = true;
/**
* 获取全局默认的超时时长
@@ -99,6 +100,30 @@ public class HttpGlobalConfig implements Serializable {
maxRedirectCount = customMaxRedirectCount;
}
+ /**
+ * 获取是否忽略响应读取时可能的EOF异常。
+ * 在Http协议中，对于Transfer-Encoding: Chunked在正常情况下末尾会写入一个Length为0的的chunk标识完整结束。
+ * 如果服务端未遵循这个规范或响应没有正常结束，会报EOF异常，此选项用于是否忽略这个异常。
+ *
+ * @return 是否忽略响应读取时可能的EOF异常
+ * @since 5.7.20
+ */
+ public static boolean isIgnoreEOFError() {
+ return ignoreEOFError;
+ }
+
+ /**
+ * 设置是否忽略响应读取时可能的EOF异常。
+ * 在Http协议中，对于Transfer-Encoding: Chunked在正常情况下末尾会写入一个Length为0的的chunk标识完整结束。
+ * 如果服务端未遵循这个规范或响应没有正常结束，会报EOF异常，此选项用于是否忽略这个异常。
+ *
+ * @param customIgnoreEOFError 是否忽略响应读取时可能的EOF异常。
+ * @since 5.7.20
+ */
+ synchronized public static void setIgnoreEOFError(boolean customIgnoreEOFError) {
+ ignoreEOFError = customIgnoreEOFError;
+ }
+
/**
* 获取Cookie管理器，用于自定义Cookie管理
*
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
index 03ae911da..d43ae1e6c 100644
--- a/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
@@ -588,7 +588,8 @@ public class HttpResponse extends HttpBase implements Closeable {
copyLength = IoUtil.copy(in, out, IoUtil.DEFAULT_BUFFER_SIZE, contentLength, streamProgress);
} catch (IORuntimeException e) {
//noinspection StatementWithEmptyBody
- if (e.getCause() instanceof EOFException || StrUtil.containsIgnoreCase(e.getMessage(), "Premature EOF")) {
+ if (HttpGlobalConfig.isIgnoreEOFError()
+ && (e.getCause() instanceof EOFException || StrUtil.containsIgnoreCase(e.getMessage(), "Premature EOF"))) {
// 忽略读取HTTP流中的EOF错误
} else {
throw e;
diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml
index 5103dc136..a41748fd4 100644
--- a/hutool-json/pom.xml
+++ b/hutool-json/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-json
diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
index 403070853..a7582edd4 100644
--- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
+++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java
@@ -671,7 +671,6 @@ public class JSONObject implements JSON, JSONGetter, Map
// 不支持对象类型转换为JSONObject
throw new JSONException("Unsupported type [{}] to JSONObject!", source.getClass());
}
-
}
/**
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
new file mode 100755
index 000000000..f1f59b68e
--- /dev/null
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
@@ -0,0 +1,43 @@
+package cn.hutool.json;
+
+import lombok.Data;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.time.LocalDate;
+import java.time.Month;
+
+/**
+ * https://github.com/dromara/hutool/issues/2090
+ */
+public class Issue2090Test {
+
+ @Test
+ public void parseTest(){
+ final TestBean test = new TestBean();
+ test.setLocalDate(LocalDate.now());
+
+ final JSONObject json = JSONUtil.parseObj(test);
+ final TestBean test1 = json.toBean(TestBean.class);
+ Assert.assertEquals(test, test1);
+ }
+
+ @Test
+ public void parseLocalDateTest(){
+ LocalDate localDate = LocalDate.now();
+ final JSONObject jsonObject = JSONUtil.parseObj(localDate);
+ Assert.assertNotNull(jsonObject.toString());
+ }
+
+ @Test
+ public void monthTest(){
+ final JSONObject jsonObject = new JSONObject();
+ jsonObject.set("month", Month.JANUARY);
+ Assert.assertEquals("{\"month\":1}", jsonObject.toString());
+ }
+
+ @Data
+ public static class TestBean{
+ private LocalDate localDate;
+ }
+}
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
index f3ae62388..3b18c8059 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.time.LocalDate;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml
index 7520a39c4..549b5b819 100644
--- a/hutool-jwt/pom.xml
+++ b/hutool-jwt/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-jwt
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index 075926147..ea661e721 100644
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-log
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index f80d0c8e9..80d7ce519 100644
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-poi
diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
index 21854b669..7fa28a4f5 100644
--- a/hutool-script/pom.xml
+++ b/hutool-script/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-script
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 107bd6367..7bd5fdce5 100644
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-setting
diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml
index 26529bfd2..d8d684dfe 100644
--- a/hutool-socket/pom.xml
+++ b/hutool-socket/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-socket
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
index ca87e5d2d..4105c3a27 100644
--- a/hutool-system/pom.xml
+++ b/hutool-system/pom.xml
@@ -9,7 +9,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool-system
diff --git a/pom.xml b/pom.xml
index baad04d0a..ec82d9de5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
cn.hutool
hutool-parent
- 5.7.20-SNAPSHOT
+ 5.7.20
hutool
Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。
https://github.com/dromara/hutool