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

improve Oracle SQL Parser, support syntax : varchar2(20 char)

Browse Source
This commit is contained in:
wenshao
2012-12-29 15:27:38 +08:00
parent 4901e6af96
commit a26df79fac
4 changed files with 155 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+14 -6
View File
@@ -1134,6 +1134,18 @@ public class SQLExprParser extends SQLParser {
SQLName typeExpr = name();
String typeName = typeExpr.toString();
if (isCharType(typeName)) {
SQLCharactorDataType charType = new SQLCharactorDataType(typeName);
if (lexer.token() == Token.LPAREN) {
lexer.nextToken();
charType.getArguments().add(this.expr());
accept(Token.RPAREN);
}
return parseCharTypeRest(charType);
}
if ("character".equalsIgnoreCase(typeName) && "varying".equalsIgnoreCase(lexer.stringVal())) {
typeName += ' ' + lexer.stringVal();
@@ -1149,16 +1161,12 @@ public class SQLExprParser extends SQLParser {
lexer.nextToken();
exprList(dataType.getArguments());
accept(Token.RPAREN);
return parseCharTypeRest(dataType);
}
return dataType;
}
protected boolean isCharType(SQLDataType dataType) {
String dataTypeName = dataType.getName();
protected boolean isCharType(String dataTypeName) {
return "char".equalsIgnoreCase(dataTypeName) //
|| "varchar".equalsIgnoreCase(dataTypeName)
|| "nchar".equalsIgnoreCase(dataTypeName)
@@ -1168,7 +1176,7 @@ public class SQLExprParser extends SQLParser {
}
protected SQLDataType parseCharTypeRest(SQLDataType dataType) {
if (!isCharType(dataType)) {
if (!isCharType(dataType.getName())) {
return dataType;
}