mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
bug fixed for sql parser. for issue #2544
This commit is contained in:
@@ -118,6 +118,13 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable,
|
||||
this.parameters.add(param);
|
||||
}
|
||||
|
||||
public void addArgument(SQLExpr arg) {
|
||||
if (arg != null) {
|
||||
arg.setParent(this);
|
||||
}
|
||||
this.parameters.add(arg);
|
||||
}
|
||||
|
||||
public void output(StringBuffer buf) {
|
||||
if (this.owner != null) {
|
||||
this.owner.output(buf);
|
||||
|
||||
@@ -235,6 +235,13 @@ public class MySqlExprParser extends SQLExprParser {
|
||||
lexer.nextToken();
|
||||
} while (lexer.token() == Token.LITERAL_CHARS || lexer.token() == Token.LITERAL_ALIAS);
|
||||
expr = new SQLCharExpr(text2);
|
||||
} else if (expr instanceof SQLVariantRefExpr) {
|
||||
SQLMethodInvokeExpr concat = new SQLMethodInvokeExpr("CONCAT");
|
||||
concat.addArgument(expr);
|
||||
concat.addArgument(this.primary());
|
||||
expr = concat;
|
||||
|
||||
return primaryRest(expr);
|
||||
}
|
||||
} else if (lexer.token() == Token.IDENTIFIER) {
|
||||
if (expr instanceof SQLHexExpr) {
|
||||
|
||||
@@ -696,7 +696,11 @@ public class SQLExprParser extends SQLParser {
|
||||
sqlExpr = unary;
|
||||
break;
|
||||
case QUES:
|
||||
lexer.nextToken();
|
||||
if (JdbcConstants.MYSQL.equals(dbType)) {
|
||||
lexer.nextTokenValue();
|
||||
} else {
|
||||
lexer.nextToken();
|
||||
}
|
||||
SQLVariantRefExpr quesVarRefExpr = new SQLVariantRefExpr("?");
|
||||
quesVarRefExpr.setIndex(lexer.nextVarIndex());
|
||||
sqlExpr = quesVarRefExpr;
|
||||
|
||||
Reference in New Issue
Block a user