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.

Browse Source
This commit is contained in:
wenshao
2017-07-19 17:55:24 +08:00
parent 8a0bf34a6c
commit 168518e0e5
37 changed files with 1017 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java
+3 -3
View File
@@ -79,7 +79,7 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
for (;;) {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("expect identifier");
throw new ParserException("expect identifier. " + lexer.info());
}
SQLColumnDefinition column = this.exprParser.parseColumn();
@@ -114,7 +114,7 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
for (;;) {
if (lexer.token() != Token.IDENTIFIER) {
throw new ParserException("expect identifier");
throw new ParserException("expect identifier. " + lexer.info());
}
SQLColumnDefinition column = this.exprParser.parseColumn();
@@ -159,7 +159,7 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
stmt.setBuckets(lexer.integerValue().intValue());
lexer.nextToken();
} else {
throw new ParserException("into buckets must be integer.");
throw new ParserException("into buckets must be integer. " + lexer.info());
}
acceptIdentifier("BUCKETS");
}
src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java
+2 -2
View File
@@ -197,7 +197,7 @@ public class OdpsLexer extends Lexer {
ch = charAt(++pos);
break;
} else if (ch == EOI) {
throw new ParserException("illegal identifier");
throw new ParserException("illegal identifier. " + info());
}
bufPos++;
@@ -214,7 +214,7 @@ public class OdpsLexer extends Lexer {
final boolean firstFlag = isFirstIdentifierChar(first);
if (!firstFlag) {
throw new ParserException("illegal identifier");
throw new ParserException("illegal identifier. " + info());
}
mark = pos;
src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java
+4 -4
View File
@@ -122,7 +122,7 @@ public class OdpsStatementParser extends SQLStatementParser {
return true;
}
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
throw new ParserException("TODO " + lexer.info());
}
if (identifierEquals("REMOVE")) {
@@ -137,7 +137,7 @@ public class OdpsStatementParser extends SQLStatementParser {
return true;
}
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
throw new ParserException("TODO " + lexer.info());
}
if (identifierEquals("READ")) {
@@ -222,7 +222,7 @@ public class OdpsStatementParser extends SQLStatementParser {
expr_condition.setExpr(this.exprParser.expr());
return expr_condition;
} else {
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
throw new ParserException("TODO " + lexer.info());
}
}
@@ -378,7 +378,7 @@ public class OdpsStatementParser extends SQLStatementParser {
return stmt;
}
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
throw new ParserException("TODO " + lexer.info());
}
public SQLStatement parseSet() {