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 fixed for oracle sql parser

Browse Source
This commit is contained in:
温少
2012-02-29 17:31:36 +08:00
parent 3e7026f63a b7e4de2501
commit 6c6fb15edf
65 changed files with 2937 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/Keywords.java
+4
View File
@@ -101,6 +101,10 @@ public class Keywords {
map.put("DEFAULT", Token.DEFAULT);
DEFAULT_KEYWORDS = new Keywords(map);
}
public boolean containsValue(Token token) {
return this.keywords.containsValue(token);
}
public Keywords(Map<String, Token> keywords){
this.keywords = keywords;
src/main/java/com/alibaba/druid/sql/parser/Lexer.java
+32 -1
View File
@@ -90,6 +90,10 @@ public class Lexer {
Token token;
}
public Keywords getKeywods() {
return keywods;
}
public void mark() {
SavePoint savePoint = new SavePoint();
savePoint.bp = bp;
@@ -143,7 +147,7 @@ public class Lexer {
protected final void scanChar() {
ch = buf[++bp];
}
protected void unscan() {
ch = buf[--bp];
}
@@ -292,11 +296,24 @@ public class Lexer {
case '@':
scanVariable();
return;
case '-':
int subNextChar = buf[bp + 1];
if (subNextChar == '-') {
scanComment();
if ((token() == Token.LINE_COMMENT || token() == Token.MULTI_LINE_COMMENT) && skipComment) {
sp = 0;
continue;
}
} else {
scanOperator();
}
return;
case '/':
int nextChar = buf[bp + 1];
if (nextChar == '/' || nextChar == '*') {
scanComment();
if ((token() == Token.LINE_COMMENT || token() == Token.MULTI_LINE_COMMENT) && skipComment) {
sp = 0;
continue;
}
} else {
@@ -852,6 +869,20 @@ public class Lexer {
return result;
}
}
public int bp() {
return this.bp;
}
public char current() {
return this.ch;
}
public void reset(int mark, char mark_ch, Token token) {
this.bp = mark;
this.ch = mark_ch;
this.token = token;
}
public final String numberString() {
return new String(buf, np, sp);
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+49 -29
View File
@@ -201,6 +201,17 @@ public class SQLExprParser extends SQLParser {
case USER:
case PASSWORD:
case DUAL:
case REFERENCE:
case KEY:
case DISTINCT:
case YEAR:
case MONTH:
case TIME:
case ZONE:
case LOG:
case LIMIT:
case SCHEMA:
case AT:
sqlExpr = new SQLIdentifierExpr(lexer.stringVal());
lexer.nextToken();
break;
@@ -250,9 +261,10 @@ public class SQLExprParser extends SQLParser {
sqlExpr = new SQLExistsExpr(createSelectParser().select(), true);
accept(Token.RPAREN);
} else if (lexer.token() == Token.LPAREN) {
lexer.token();
lexer.nextToken();
sqlExpr = new SQLNotExpr(expr());
SQLExpr notTarget = expr();
sqlExpr = new SQLNotExpr(notTarget);
accept(Token.RPAREN);
return primaryRest(sqlExpr);
@@ -393,13 +405,6 @@ public class SQLExprParser extends SQLParser {
sqlExpr = someExpr;
break;
case KEY:
case DISTINCT:
case YEAR:
case MONTH:
lexer.nextToken();
sqlExpr = new SQLIdentifierExpr(tok.name());
break;
case ALL:
lexer.nextToken();
SQLAllExpr allExpr = new SQLAllExpr();
@@ -414,7 +419,7 @@ public class SQLExprParser extends SQLParser {
sqlExpr = allExpr;
break;
default:
throw new ParserException("ERROR. token : " + tok);
throw new ParserException("ERROR. token : " + tok + " " + lexer.stringVal());
}
return primaryRest(sqlExpr);
@@ -436,14 +441,26 @@ public class SQLExprParser extends SQLParser {
if (lexer.token() == Token.DOT) {
lexer.nextToken();
expr = dotRest(expr);
return primaryRest(expr);
} else if (lexer.token() == Token.COLONEQ) {
lexer.nextToken();
SQLExpr rightExp = primary();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Assignment, rightExp);
} else {
if (lexer.token() == Token.LPAREN) {
if (expr instanceof SQLIdentifierExpr || expr instanceof SQLDefaultExpr) {
String method_name = expr.toString();
if (expr instanceof SQLName || expr instanceof SQLDefaultExpr) {
String method_name;
SQLMethodInvokeExpr methodInvokeExpr;
if (expr instanceof SQLPropertyExpr) {
method_name = ((SQLPropertyExpr) expr).getName();
methodInvokeExpr = new SQLMethodInvokeExpr(method_name);
methodInvokeExpr.setOwner(((SQLPropertyExpr) expr).getOwner());
} else {
method_name = expr.toString();
methodInvokeExpr = new SQLMethodInvokeExpr(method_name);
}
lexer.nextToken();
if (isAggreateFunction(method_name)) {
@@ -452,7 +469,7 @@ public class SQLExprParser extends SQLParser {
return aggregateExpr;
}
SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(method_name);
if (lexer.token() != Token.RPAREN) {
exprList(methodInvokeExpr.getParameters());
}
@@ -476,14 +493,15 @@ public class SQLExprParser extends SQLParser {
} else {
String name;
if (lexer.token() == Token.KEY) {
name = "KEY";
lexer.nextToken();
} else if (lexer.token() != Token.IDENTIFIER && lexer.token() != Token.USER && lexer.token() != Token.PASSWORD) {
throw new ParserException("error : " + lexer.stringVal());
} else {
if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_CHARS
|| lexer.token() == Token.LITERAL_ALIAS) {
name = lexer.stringVal();
lexer.nextToken();
} else if (lexer.getKeywods().containsValue(lexer.token())) {
name = lexer.stringVal();
lexer.nextToken();
} else {
throw new ParserException("error : " + lexer.stringVal());
}
if (lexer.token() == Token.LPAREN) {
@@ -567,16 +585,17 @@ public class SQLExprParser extends SQLParser {
SQLName name = new SQLIdentifierExpr(identName);
if (lexer.token() == Token.DOT) {
while (lexer.token() == Token.DOT) {
lexer.nextToken();
if (lexer.token() == Token.KEY) {
name = new SQLPropertyExpr(name, "KEY");
lexer.nextToken();
return name;
}
if (lexer.token() != Token.LITERAL_ALIAS && lexer.token() != Token.IDENTIFIER) {
if (lexer.token() != Token.LITERAL_ALIAS && lexer.token() != Token.IDENTIFIER
&& (!lexer.getKeywods().containsValue(lexer.token()))) {
throw new ParserException("error, " + lexer.token());
}
@@ -610,6 +629,7 @@ public class SQLExprParser extends SQLParser {
} else {
aggregateExpr = new SQLAggregateExpr(method_name, 1);
}
exprList(aggregateExpr.getArguments());
accept(Token.RPAREN);
@@ -693,7 +713,7 @@ public class SQLExprParser extends SQLParser {
return equalityRest(expr);
}
public final SQLExpr equalityRest(SQLExpr expr) throws ParserException {
public SQLExpr equalityRest(SQLExpr expr) throws ParserException {
SQLExpr rightExp;
if (lexer.token() == Token.EQ) {
lexer.nextToken();
@@ -920,9 +940,9 @@ public class SQLExprParser extends SQLParser {
expr = notRationalRest(expr);
} else if (lexer.token() == (Token.BETWEEN)) {
lexer.nextToken();
SQLExpr beginExpr = primary();
SQLExpr beginExpr = bitOr();
accept(Token.AND);
SQLExpr endExpr = primary();
SQLExpr endExpr = bitOr();
expr = new SQLBetweenExpr(expr, beginExpr, endExpr);
} else if (lexer.token() == (Token.IS)) {
lexer.nextToken();
@@ -981,9 +1001,9 @@ public class SQLExprParser extends SQLParser {
return expr;
} else if (lexer.token() == (Token.BETWEEN)) {
lexer.nextToken();
SQLExpr beginExpr = primary();
SQLExpr beginExpr = bitOr();
accept(Token.AND);
SQLExpr endExpr = primary();
SQLExpr endExpr = bitOr();
expr = new SQLBetweenExpr(expr, true, beginExpr, endExpr);
@@ -995,8 +1015,8 @@ public class SQLExprParser extends SQLParser {
}
public SQLDataType parseDataType() throws ParserException {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException();
if (lexer.token() != Token.DATE && lexer.token() != Token.TIMESTAMP && lexer.token() != Token.IDENTIFIER) {
throw new ParserException("unexpect token : " + lexer.token() + " " + lexer.stringVal());
}
String typeName = lexer.stringVal();
src/main/java/com/alibaba/druid/sql/parser/SQLParser.java
+7 -3
View File
@@ -65,7 +65,8 @@ public class SQLParser {
return alias;
}
if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.KEY) {
if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.KEY
|| lexer.token() == Token.CASE || lexer.token() == Token.TIMESTAMP) {
alias = lexer.token.name();
lexer.nextToken();
return alias;
@@ -92,7 +93,9 @@ public class SQLParser {
} else if (lexer.token() == Token.LITERAL_CHARS) {
alias = "'" + lexer.stringVal() + "'";
lexer.nextToken();
} else if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY) {
} else if (lexer.token() == Token.YEAR || lexer.token() == Token.DAY || lexer.token() == Token.TIME
|| lexer.token() == Token.MONTH || lexer.token() == Token.CASE || lexer.token() == Token.AT
|| lexer.token() == Token.TIMESTAMP) {
alias = lexer.token.name();
lexer.nextToken();
}
@@ -114,7 +117,8 @@ public class SQLParser {
lexer.nextToken();
} else {
setErrorEndPos(lexer.pos());
throw new SQLParseException("syntax error, expect " + token + ", actual " + lexer.token() + " " + lexer.stringVal());
throw new SQLParseException("syntax error, expect " + token + ", actual " + lexer.token() + " "
+ lexer.stringVal());
}
}
src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+25 -2
View File
@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
@@ -36,6 +37,7 @@ import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement;
import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleSelectParser;
public class SQLStatementParser extends SQLParser {
@@ -250,7 +252,7 @@ public class SQLStatementParser extends SQLParser {
return stmt;
}
public SQLSetStatement parseSet() throws ParserException {
public SQLStatement parseSet() throws ParserException {
accept(Token.SET);
SQLSetStatement stmt = new SQLSetStatement();
@@ -299,7 +301,7 @@ public class SQLStatementParser extends SQLParser {
}
public SQLSelectParser createSQLSelectParser() {
return new SQLSelectParser(this.lexer);
return new OracleSelectParser(this.lexer);
}
public SQLUpdateStatement parseUpdateStatement() throws ParserException {
@@ -383,4 +385,25 @@ public class SQLStatementParser extends SQLParser {
return createView;
}
public SQLCommentStatement parseComment() {
accept(Token.COMMENT);
SQLCommentStatement stmt = new SQLCommentStatement();
accept(Token.ON);
if (lexer.token() == Token.TABLE) {
stmt.setType(SQLCommentStatement.Type.TABLE);
lexer.nextToken();
} else if (lexer.token() == Token.COLUMN) {
stmt.setType(SQLCommentStatement.Type.COLUMN);
lexer.nextToken();
}
stmt.setOn(this.exprParser.name());
accept(Token.IS);
stmt.setComment(this.exprParser.expr());
return stmt;
}
}
src/main/java/com/alibaba/druid/sql/parser/Token.java
+10
View File
@@ -68,6 +68,7 @@ public enum Token {
SCHEMA("SCHEMA"),
CAST("CAST"),
USER("USER"),
COLUMN("COLUMN"),
AND("AND"),
OR("OR"),
@@ -128,6 +129,7 @@ public enum Token {
USING("USING"),
CURRENT("CURRENT"),
RETURNING("RETURNING"),
COMMENT("COMMENT"),
// oracle
START("START"),
@@ -157,6 +159,14 @@ public enum Token {
WAIT("WAIT"),
ADVISE("ADVISE"),
SESSION("SESSION"),
AT("AT"),
LOCAL("LOCAL"),
TIME("TIME"),
ZONE("ZONE"),
SYSDATE("SYSDATE"),
DECLARE("DECLARE"),
EXCEPTION("EXCEPTION"),
GRANT("GRANT"),
// transact-sql
TOP("TOP"),