This commit is contained in:
温少
2012-05-16 08:25:21 +08:00
16 changed files with 604 additions and 193 deletions
@@ -620,7 +620,7 @@ public class SQLExprParser extends SQLParser {
identName = lexer.stringVal();
lexer.nextToken();
} else if (lexer.token() == Token.REFERENCE || lexer.token() == Token.DATE || lexer.token() == Token.TIMESTAMP) {
} else if (lexer.token() == Token.REFERENCE) {
identName = lexer.stringVal();
lexer.nextToken();
} else {
@@ -69,7 +69,7 @@ public class SQLParser {
return alias;
}
if (lexer.token() == Token.KEY || lexer.token() == Token.CASE || lexer.token() == Token.TIMESTAMP) {
if (lexer.token() == Token.KEY || lexer.token() == Token.CASE) {
alias = lexer.token.name();
lexer.nextToken();
return alias;
@@ -97,7 +97,7 @@ public class SQLParser {
alias = "'" + lexer.stringVal() + "'";
lexer.nextToken();
} else if (lexer.token() == Token.TIME || lexer.token() == Token.CASE || lexer.token() == Token.AT
|| lexer.token() == Token.TIMESTAMP || lexer.token() == Token.LOG) {
|| lexer.token() == Token.LOG) {
alias = lexer.token.name();
lexer.nextToken();
}
@@ -140,8 +140,6 @@ public enum Token {
CONNECT("CONNECT"),
WITH("WITH"),
EXTRACT("EXTRACT"),
TIMESTAMP("TIMESTAMP"),
DATE("DATE"),
CURSOR("CURSOR"),
TO("TO"),
MODEL("MODEL"),