Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved sql parser. for issue #2080

Browse Source
This commit is contained in:
wenshao
2017-10-31 22:59:25 +08:00
parent 46e8847c22
commit 1cfe3c639a
13 changed files with 316 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+24 -6
View File
@@ -3134,6 +3134,8 @@ public class SQLStatementParser extends SQLParser {
}
protected void parseValueClause(List<SQLInsertStatement.ValuesClause> valueClauseList, int columnSize, SQLObject parent) {
final boolean optimizedForParameterized = lexer.isEnabled(SQLParserFeature.OptimizedForParameterized);
for (int i = 0; ; ++i) {
int startPos = lexer.pos() - 1;
@@ -3149,17 +3151,34 @@ public class SQLStatementParser extends SQLParser {
} else {
valueExprList = new ArrayList<SQLExpr>();
}
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
values.setParent(parent);
for (; ; ) {
SQLExpr expr;
if (lexer.token() == Token.LITERAL_INT) {
expr = new SQLIntegerExpr(lexer.integerValue());
if (optimizedForParameterized) {
expr = new SQLVariantRefExpr("?");
values.incrementReplaceCount();
} else {
expr = new SQLIntegerExpr(lexer.integerValue());
}
lexer.nextTokenComma();
} else if (lexer.token() == Token.LITERAL_CHARS) {
expr = new SQLCharExpr(lexer.stringVal());
if (optimizedForParameterized) {
expr = new SQLVariantRefExpr("?");
values.incrementReplaceCount();
} else {
expr = new SQLCharExpr(lexer.stringVal());
}
lexer.nextTokenComma();
} else if (lexer.token() == Token.LITERAL_NCHARS) {
expr = new SQLNCharExpr(lexer.stringVal());
if (optimizedForParameterized) {
expr = new SQLVariantRefExpr("?");
values.incrementReplaceCount();
} else {
expr = new SQLNCharExpr(lexer.stringVal());
}
lexer.nextTokenComma();
} else {
expr = exprParser.expr();
@@ -3167,10 +3186,12 @@ public class SQLStatementParser extends SQLParser {
if (lexer.token() == Token.COMMA) {
valueExprList.add(expr);
expr.setParent(values);
lexer.nextTokenValue();
continue;
} else if (lexer.token() == Token.RPAREN) {
valueExprList.add(expr);
expr.setParent(values);
break;
} else {
expr = this.exprParser.primaryRest(expr);
@@ -3188,9 +3209,6 @@ public class SQLStatementParser extends SQLParser {
}
}
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
values.setParent(parent);
if (lexer.isEnabled(SQLParserFeature.KeepInsertValueClauseOriginalString)) {
int endPos = lexer.pos();
String orginalString = lexer.subString(startPos, endPos - startPos);