bug fixed for SchemaStatVisitor, for issue #3058

This commit is contained in:
shaojin.wensj
2019-02-03 10:20:52 +08:00
parent c3ec6ed6ee
commit 60b579e878
3 changed files with 65 additions and 6 deletions
@@ -107,10 +107,14 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable,
this.from = x;
}
public List<SQLExpr> getArguments() {
return this.parameters;
}
public List<SQLExpr> getParameters() {
return this.parameters;
}
public void addParameter(SQLExpr param) {
if (param != null) {
param.setParent(this);
@@ -791,8 +791,8 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
for (;;) {
if (expr instanceof SQLMethodInvokeExpr) {
SQLMethodInvokeExpr methodInvokeExp = (SQLMethodInvokeExpr) expr;
if (methodInvokeExp.getParameters().size() == 1) {
SQLExpr firstExpr = methodInvokeExp.getParameters().get(0);
if (methodInvokeExp.getArguments().size() == 1) {
SQLExpr firstExpr = methodInvokeExp.getArguments().get(0);
expr = firstExpr;
continue;
}
@@ -823,9 +823,11 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
SQLSelectItem selectItem = queryBlock.findSelectItem(propertyExpr
.nameHashCode64());
if (selectItem != null) {
expr = selectItem.getExpr();
continue;
SQLExpr selectItemExpr = selectItem.getExpr();
if (selectItemExpr != expr) {
expr = selectItemExpr;
continue;
}
} else if (queryBlock.selectItemHasAllColumn()) {
SQLTableSource allColumnTableSource = null;