diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce40ebf55..901fa845b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.25(2023-12-26)
+# 5.8.25(2023-12-28)
 
 ### 🐣新特性
 ### 🐞Bug修复
 * 【core  】      修复StrJoin当append内容后调用length()会出现空指针问题（issue#3444@Github）
+* 【core  】      修复PostgreSQL、H2使用upsert字段大小写问题（issue#I8PB4X@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.24(2023-12-23)
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 110aea5f6..8e0f8b4a2 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
@@ -63,6 +63,7 @@ public class H2Dialect extends AnsiSqlDialect {
 		String tableName = entity.getTableName();
 		if (null != this.wrapper) {
 			tableName = this.wrapper.wrap(tableName);
+			keys = wrapper.wrap(keys);
 		}
 		builder.append("MERGE INTO ").append(tableName)
 				// 字段列表
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 a7bd189e5..32cfa273b 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
@@ -65,6 +65,7 @@ public class PostgresqlDialect extends AnsiSqlDialect{
 		String tableName = entity.getTableName();
 		if (null != this.wrapper) {
 			tableName = this.wrapper.wrap(tableName);
+			keys = wrapper.wrap(keys);
 		}
 		builder.append("INSERT INTO ").append(tableName)
 				// 字段列表