Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wenshao
2014-10-26 18:22:16 +08:00
45 changed files with 1219 additions and 43 deletions
@@ -315,6 +315,7 @@ public class SQLExprParser extends SQLParser {
case MODE:
case ADVISE:
case VIEW:
case ESCAPE:
sqlExpr = new SQLIdentifierExpr(lexer.stringVal());
lexer.nextToken();
break;
@@ -975,7 +976,7 @@ public class SQLExprParser extends SQLParser {
}
public final SQLExpr bitOrRest(SQLExpr expr) {
if (lexer.token() == Token.BAR) {
while (lexer.token() == Token.BAR) {
lexer.nextToken();
SQLExpr rightExp = bitAnd();
expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BitwiseOr, rightExp);