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

Merge pull request #838 from magicdoom/master

Browse Source 
修复解析mysql的load datainfile语句中包含FIELDS TERMINATED，ENCLOSED等参数时出错的bug
This commit is contained in:
高铁
2015-06-06 01:30:51 +08:00
parent f0b1407d44 75f1ac90e6
commit d3feb93740
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+14 -6
View File
@@ -1760,6 +1760,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
protected MySqlLoadDataInFileStatement parseLoadDataInFile() {
acceptIdentifier("DATA");
MySqlLoadDataInFileStatement stmt = new MySqlLoadDataInFileStatement();
@@ -1818,7 +1819,8 @@ public class MySqlStatementParser extends SQLStatementParser {
if (identifierEquals("TERMINATED")) {
lexer.nextToken();
accept(Token.BY);
stmt.setColumnsTerminatedBy((SQLLiteralExpr) this.exprParser.expr());
stmt.setColumnsTerminatedBy(new SQLCharExpr(lexer.stringVal()));
lexer.nextToken();
}
if (identifierEquals("OPTIONALLY")) {
@@ -1829,13 +1831,15 @@ public class MySqlStatementParser extends SQLStatementParser {
if (identifierEquals("ENCLOSED")) {
lexer.nextToken();
accept(Token.BY);
stmt.setColumnsEnclosedBy((SQLLiteralExpr) this.exprParser.expr());
stmt.setColumnsEnclosedBy(new SQLCharExpr(lexer.stringVal()));
lexer.nextToken();
}
if (identifierEquals("ESCAPED")) {
lexer.nextToken();
accept(Token.BY);
stmt.setColumnsEscaped((SQLLiteralExpr) this.exprParser.expr());
stmt.setColumnsEscaped(new SQLCharExpr(lexer.stringVal()));
lexer.nextToken();
}
}
@@ -1844,19 +1848,21 @@ public class MySqlStatementParser extends SQLStatementParser {
if (identifierEquals("STARTING")) {
lexer.nextToken();
accept(Token.BY);
stmt.setLinesStartingBy((SQLLiteralExpr) this.exprParser.expr());
stmt.setLinesStartingBy(new SQLCharExpr(lexer.stringVal()));
lexer.nextToken();
}
if (identifierEquals("TERMINATED")) {
lexer.nextToken();
accept(Token.BY);
stmt.setLinesTerminatedBy((SQLLiteralExpr) this.exprParser.expr());
stmt.setLinesTerminatedBy(new SQLCharExpr(lexer.stringVal()));
lexer.nextToken();
}
}
if (identifierEquals(IGNORE)) {
lexer.nextToken();
stmt.setIgnoreLinesNumber((SQLLiteralExpr) this.exprParser.expr());
stmt.setIgnoreLinesNumber( this.exprParser.expr());
acceptIdentifier("LINES");
}
@@ -1872,6 +1878,8 @@ public class MySqlStatementParser extends SQLStatementParser {
}
return stmt;
}
public MySqlPrepareStatement parsePrepare() {