lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-09-03 06:35:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(crud): 修复多 CTE 查询重写缺少逗号 (#349)

Browse Source
This commit is contained in:
PengyuDeng
2026-04-25 19:20:38 +08:00
committed by GitHub
parent 4f9129cd8c
commit 5e8f735895
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java
View File

@@ -878,6 +878,8 @@ class QueryAnalyzerImpl implements FromItemVisitor, SelectItemVisitor, SelectVis
public void visit(WithItem withItem) {
if (!StringUtils.hasText(prefix)) {
prefix += "WITH ";
} else {
prefix += ", ";
}
prefix += withItem;
PrepareStatementVisitor visitor = new PrepareStatementVisitor();

26
hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/QueryAnalyzerImplTest.java
View File

@@ -772,32 +772,14 @@ public class QueryAnalyzerImplTest {
"LEFT JOIN cte2 ON cte1.id = cte2.id");
SqlRequest request = analyzer
.refactor(QueryParamEntity.of().toQuery().and("name", "like", "test%").getParam(), 1, "test");
.refactor(QueryParamEntity.of().toQuery().and("name", "like", "test%").getParam(), "test", "test");
System.out.println(request);
// 多个CTE在某些情况下生成的SQL可能无法直接执行（CTE之间缺少逗号），只验证SQL生成
assertNotNull(request.getSql(), "SQL should be generated");
assertNotNull(request.getParameters(), "Parameters should be set");
// 如果生成的SQL语法正确，尝试执行
try {
executeAndVerify(request);
} catch (AssertionError e) {
// 如果是语法错误，只验证SQL已生成
if (e.getMessage() != null && e.getMessage().contains("Syntax error")) {
System.out.println("SQL generated but has syntax issue (CTE comma missing): " + e.getMessage());
return;
}
throw e;
} catch (Exception e) {
// 如果是语法错误，只验证SQL已生成
if (e.getMessage() != null && (e.getMessage().contains("Syntax error") ||
e.getMessage().contains("expected"))) {
System.out.println("SQL generated but has syntax issue (CTE comma missing): " + e.getMessage());
return;
}
throw e;
}
assertTrue(request.getSql().contains("), cte2 AS"), "multiple CTEs should be separated by comma");
executeAndVerify(request);
}
@Test