Merge pull request #4089 from xxx-tea/v5-dev

fix:SqlUtil#removeOuterOrderBy处理没有order by的语句导致异常
This commit is contained in:
Golden Looly 2025-09-29 16:52:34 +08:00 committed by GitHub
commit 89c1d13f66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions

View File

@ -270,7 +270,8 @@ public class SqlUtil {
*/ */
public static String removeOuterOrderBy(final String selectSql) { public static String removeOuterOrderBy(final String selectSql) {
// 去除order by 子句 // 去除order by 子句
return ReUtil.getGroup1(PATTERN_ORDER_BY, selectSql); String sql = ReUtil.getGroup1(PATTERN_ORDER_BY, selectSql);
return sql == null ? selectSql : sql;
} }
/** /**

View File

@ -28,4 +28,15 @@ public class Issue4066Test {
assertEquals("SELECT id, name, age FROM users WHERE status = 'active'", result); assertEquals("SELECT id, name, age FROM users WHERE status = 'active'", result);
} }
/**
* 测试不含Order by的语句
*/
@Test
public void removeOuterOrderByTest3() {
final String sql = "SELECT * FROM users";
final String result = SqlUtil.removeOuterOrderBy(sql);
assertEquals("SELECT * FROM users", result);
}
} }