修复SqlExecutor.execute执行ORACLE insert into select报ORA-00933问题

looly · looly · commit 791ba35ba0da · 2023-05-26T22:27:33.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@
 * 【cron  】      修复SystemTimer无法结束进程问题（issue#3090@Github）
 * 【core  】      修复BeanUtil.copyToList复制Long等类型错误问题（issue#3091@Github）
 * 【poi   】      修复MapRowHandler结果Map无序问题（issue#I71SE8@Github）
+* 【db    】      修复SqlExecutor.execute执行ORACLE insert into select报ORA-00933问题（issue#I778U7@Github）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.18 (2023-04-27)
diff --git a/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java b/hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
@@ -124,6 +124,21 @@ public static PreparedStatement prepareStatement(Connection conn, String sql, Co
 	 * @since 3.2.3
 	 */
 	public static PreparedStatement prepareStatement(Connection conn, String sql, Object... params) throws SQLException {
+		return prepareStatement(GlobalDbConfig.returnGeneratedKey, conn, sql, params);
+	}
+
+	/**
+	 * 创建{@link PreparedStatement}
+	 *
+	 * @param returnGeneratedKey 当为insert语句时，是否返回主键
+	 * @param conn   数据库连接
+	 * @param sql    SQL语句，使用"?"做为占位符
+	 * @param params "?"对应参数列表
+	 * @return {@link PreparedStatement}
+	 * @throws SQLException SQL异常
+	 * @since 5.8.19
+	 */
+	public static PreparedStatement prepareStatement(boolean returnGeneratedKey, Connection conn, String sql, Object... params) throws SQLException {
 		Assert.notBlank(sql, "Sql String must be not blank!");
 		sql = sql.trim();
 
@@ -136,7 +151,7 @@ public static PreparedStatement prepareStatement(Connection conn, String sql, Ob
 
 		SqlLog.INSTANCE.log(sql, ArrayUtil.isEmpty(params) ? null : params);
 		PreparedStatement ps;
-		if (GlobalDbConfig.returnGeneratedKey && StrUtil.startWithIgnoreCase(sql, "insert")) {
+		if (returnGeneratedKey && StrUtil.startWithIgnoreCase(sql, "insert")) {
 			// 插入默认返回主键
 			ps = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
 		} else {
diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java
@@ -54,7 +54,7 @@ public static int execute(Connection conn, String sql, Map<String, Object> param
 	public static int execute(Connection conn, String sql, Object... params) throws SQLException {
 		PreparedStatement ps = null;
 		try {
-			ps = StatementUtil.prepareStatement(conn, sql, params);
+			ps = StatementUtil.prepareStatement(false, conn, sql, params);
 			return ps.executeUpdate();
 		} finally {
 			DbUtil.close(ps);
@@ -128,7 +128,7 @@ public static Long executeForGeneratedKey(Connection conn, String sql, Object...
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			ps = StatementUtil.prepareStatement(conn, sql, params);
+			ps = StatementUtil.prepareStatement(true, conn, sql, params);
 			ps.executeUpdate();
 			rs = ps.getGeneratedKeys();
 			if (rs != null && rs.next()) {
@@ -271,7 +271,7 @@ public static <T> T query(Connection conn, SqlBuilder sqlBuilder, RsHandler<T> r
 	public static <T> T query(Connection conn, String sql, RsHandler<T> rsh, Object... params) throws SQLException {
 		PreparedStatement ps = null;
 		try {
-			ps = StatementUtil.prepareStatement(conn, sql, params);
+			ps = StatementUtil.prepareStatement(false, conn, sql, params);
 			return executeQuery(ps, rsh);
 		} finally {
 			DbUtil.close(ps);
