lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复嵌套SQL中order by子句错误截断问题

Browse Source
This commit is contained in:
Looly 2023-12-12 22:14:54 +08:00
parent c45de2b7f4
commit b8f3529238
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@
* 【core 】 修复ImgUtil.convert png转jpg在jdk9+中失败问题（issue#I8L8UA@Gitee）
* 【cache 】 修复StampedCache的get方法非原子问题（issue#I8MEIX@Gitee）
* 【core 】 修复StrSplitter.splitByRegex使用空参数导致的OOM问题（issue#3421@Github）
* 【db 】 修复嵌套SQL中order by子句错误截断问题（issue#I89RXV@Gitee）
-------------------------------------------------------------------------------------------------------------
# 5.8.23(2023-11-12)

14
hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
View File

@ -1,8 +1,11 @@
package cn.hutool.db;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.RegexPool;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.dialect.Dialect;
import cn.hutool.db.dialect.DialectFactory;
@ -18,6 +21,8 @@ import java.io.Serializable;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 提供基于方言的原始增删改查执行封装
@ -273,11 +278,14 @@ public class DialectRunner implements Serializable {
checkConn(conn);
String selectSql = sqlBuilder.build();
// 去除order by 子句
final int orderByIndex = StrUtil.lastIndexOfIgnoreCase(selectSql, " order by");
if (orderByIndex > 0) {
selectSql = StrUtil.subPre(selectSql, orderByIndex);
final Pattern pattern = PatternPool.get("(.*?)[\\s]order[\\s]by[\\s][^\\s]+\\s(asc|desc)?", Pattern.CASE_INSENSITIVE);
final Matcher matcher = pattern.matcher(selectSql);
if (matcher.matches()) {
selectSql = matcher.group(1);
}
return SqlExecutor.queryAndClosePs(dialect.psForCount(conn,
SqlBuilder.of(selectSql).addParams(sqlBuilder.getParamValueArray())),
new NumberHandler()).longValue();