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

bug for mysql parser

Browse Source
This commit is contained in:
温少
2012-03-09 00:49:48 +08:00
parent 96e8a83a37
commit 3ca4a35863
14 changed files with 308 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+31 -28
View File
@@ -1056,50 +1056,53 @@ public class SQLExprParser extends SQLParser {
String typeName = typeExpr.toString();
SQLDataType dataType = new SQLDataTypeImpl(typeName);
parseDataTypeRest(dataType);
return dataType;
return parseDataTypeRest(dataType);
}
protected void parseDataTypeRest(SQLDataType dataType) {
protected SQLDataType parseDataTypeRest(SQLDataType dataType) {
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
exprList(dataType.getArguments());
accept(Token.RPAREN);
return parseCharTypeRest(dataType);
}
return dataType;
}
protected SQLDataType parseCharType() throws ParserException {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
protected boolean isCharType(SQLDataType dataType) {
String dataTypeName = dataType.getName();
return "char".equalsIgnoreCase(dataTypeName) //
|| "varchar".equalsIgnoreCase(dataTypeName)
|| "nchar".equalsIgnoreCase(dataTypeName)
|| "nvarchar".equalsIgnoreCase(dataTypeName)
//
;
}
protected SQLDataType parseCharTypeRest(SQLDataType dataType) {
if (!isCharType(dataType)) {
return dataType;
}
String typeName = lexer.stringVal();
SQLCharactorDataType charType = new SQLCharactorDataType(dataType.getName());
charType.getArguments().addAll(dataType.getArguments());
lexer.nextToken();
SQLCharactorDataType dataType = new SQLCharactorDataType(typeName);
if (lexer.token() == (Token.LPAREN)) {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("syntax error " + lexer.token() + " " + lexer.stringVal());
}
if (identifierEquals("CHARACTER")) {
lexer.nextToken();
exprList(dataType.getArguments());
accept(Token.RPAREN);
}
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
}
if (lexer.stringVal().equalsIgnoreCase("CHARACTER")) {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
}
if (!lexer.stringVal().equalsIgnoreCase("SET")) {
throw new ParserException();
}
accept(Token.SET);
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
}
dataType.setCharSetName(lexer.stringVal());
charType.setCharSetName(lexer.stringVal());
lexer.nextToken();
if (lexer.token() == Token.IDENTIFIER) {
@@ -1109,12 +1112,12 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
}
dataType.setCollate(lexer.stringVal());
charType.setCollate(lexer.stringVal());
lexer.nextToken();
}
}
}
return dataType;
return charType;
}
public void accept(Token token) {