lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-05-22 17:07:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复QueryHelper子查询中无法使用预编译参数问题. (#228)

Browse Source
This commit is contained in:
老周
2023-08-28 10:33:21 +08:00
committed by GitHub
parent 07526baae0
commit 7de1070beb
2 changed files with 137 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,10 @@ package org.hswebframework.web.crud.query;
import lombok.Getter;
import lombok.SneakyThrows;
import net.sf.jsqlparser.expression.Alias;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
import net.sf.jsqlparser.expression.JdbcParameter;
import net.sf.jsqlparser.expression.*;
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.select.*;
import net.sf.jsqlparser.statement.values.ValuesStatement;
import org.apache.commons.collections4.CollectionUtils;
@@ -604,6 +603,9 @@ class QueryAnalyzerImpl implements FromItemVisitor, SelectItemVisitor, SelectVis
from.append("FROM ");
from.append(plainSelect.getFromItem());
PrepareStatementVisitor visitor = new PrepareStatementVisitor();
plainSelect.getFromItem().accept(visitor);
prefixParameters += visitor.parameterSize;
}
if (plainSelect.getJoins() != null) {
@@ -847,14 +849,132 @@ class QueryAnalyzerImpl implements FromItemVisitor, SelectItemVisitor, SelectVis
@Getter
static class PrepareStatementVisitor extends ExpressionVisitorAdapter {
static class PrepareStatementVisitor extends ExpressionVisitorAdapter implements FromItemVisitor, SelectVisitor {
private int parameterSize;
public PrepareStatementVisitor() {
setSelectVisitor(this);
}
@Override
public void visit(JdbcParameter parameter) {
parameterSize++;
super.visit(parameter);
}
@Override
public void visit(net.sf.jsqlparser.schema.Table tableName) {
}
@Override
public void visit(SubJoin subjoin) {
if (subjoin.getLeft() != null) {
subjoin.getLeft().accept(this);
}
if (CollectionUtils.isNotEmpty(subjoin.getJoinList())) {
for (net.sf.jsqlparser.statement.select.Join join : subjoin.getJoinList()) {
if (join.getRightItem() != null) {
join.getRightItem().accept(this);
}
if (join.getOnExpressions() != null) {
join.getOnExpressions().forEach(expr -> expr.accept(this));
}
}
}
}
@Override
public void visit(LateralSubSelect lateralSubSelect) {
if (lateralSubSelect.getSubSelect() != null) {
lateralSubSelect.getSubSelect().accept((ExpressionVisitor) this);
}
}
@Override
public void visit(ValuesList valuesList) {
if (valuesList.getMultiExpressionList() != null) {
for (ExpressionList expressionList : valuesList.getMultiExpressionList().getExpressionLists()) {
expressionList.getExpressions().forEach(expr -> expr.accept(this));
}
}
}
@Override
public void visit(TableFunction tableFunction) {
tableFunction.getFunction().accept(this);
}
@Override
public void visit(ParenthesisFromItem aThis) {
aThis.getFromItem().accept(this);
}
@Override
public void visit(PlainSelect plainSelect) {
plainSelect.getFromItem().accept(this);
if (plainSelect.getJoins() != null) {
for (net.sf.jsqlparser.statement.select.Join join : plainSelect.getJoins()) {
join.getRightItem().accept(this);
}
}
if (plainSelect.getSelectItems() != null) {
for (SelectItem selectItem : plainSelect.getSelectItems()) {
selectItem.accept(this);
}
}
if (plainSelect.getWhere() != null) {
plainSelect.getWhere().accept(this);
}
if (plainSelect.getHaving() != null) {
plainSelect.getHaving().accept(this);
}
if (plainSelect.getGroupBy() != null) {
for (Expression expression : plainSelect.getGroupBy().getGroupByExpressionList().getExpressions()) {
expression.accept(this);
}
}
}
@Override
public void visit(SetOperationList setOpList) {
if (CollectionUtils.isNotEmpty(setOpList.getSelects())) {
for (SelectBody select : setOpList.getSelects()) {
select.accept(this);
}
}
if (setOpList.getOffset() != null) {
setOpList.getOffset().getOffset().accept(this);
}
if (setOpList.getLimit() != null) {
if (setOpList.getLimit().getRowCount() != null) {
setOpList.getLimit().getRowCount().accept(this);
}
if (setOpList.getLimit().getOffset() != null) {
setOpList.getLimit().getOffset().accept(this);
}
}
}
@Override
public void visit(WithItem withItem) {
if (CollectionUtils.isNotEmpty(withItem.getWithItemList())) {
for (SelectItem selectItem : withItem.getWithItemList()) {
selectItem.accept(this);
}
}
if (withItem.getSubSelect() != null) {
withItem.getSubSelect().accept((ExpressionVisitor) this);
}
}
@Override
public void visit(ValuesStatement aThis) {
if (aThis.getExpressions() != null) {
aThis.getExpressions().accept(this);
}
}
}
private interface QueryRefactor {

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

@@ -108,4 +108,16 @@ class QueryAnalyzerImplTest {
System.out.println(request);
}
@Test
void testPrepare(){
QueryAnalyzerImpl analyzer = new QueryAnalyzerImpl(
database,
"select * from (select substring(id,9) id from s_test where left(id,1) = ?) t");
SqlRequest request = analyzer
.refactor(QueryParamEntity.of(),33);
System.out.println(request);
}
}