Merge pull request #657 from yakolee/master

improve sqlwall & parser
This commit is contained in:
Yako
2014-09-22 11:24:04 +08:00
16 changed files with 469 additions and 25 deletions
@@ -2542,6 +2542,10 @@ public class MySqlStatementParser extends SQLStatementParser {
if (lexer.token() == Token.DEFAULT) {
lexer.nextToken();
}
if (lexer.token() == Token.HINT) {
stmt.setHints(this.exprParser.parseHints());
}
return stmt;
}
@@ -1128,12 +1128,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(" WITH CONSISTENT SNAPSHOT");
}
List<SQLCommentHint> hints = x.getHints();
if (hints != null && !hints.isEmpty()) {
if (x.getHints() != null && x.getHints().size() > 0) {
print(" ");
for (SQLCommentHint hint : hints) {
hint.accept(this);
}
printAndAccept(x.getHints(), " ");
}
if (x.isBegin()) {
@@ -2148,12 +2145,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
x.getTable().accept(this);
}
List<SQLCommentHint> hints = x.getHints();
if (hints != null && !hints.isEmpty()) {
if (x.getHints() != null && x.getHints().size() > 0) {
print(" ");
for (SQLCommentHint hint : hints) {
hint.accept(this);
}
printAndAccept(x.getHints(), " ");
}
return false;
@@ -2690,12 +2684,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
print(x.getLockType().name);
}
List<SQLCommentHint> hints = x.getHints();
if (hints != null && !hints.isEmpty()) {
if (x.getHints() != null && x.getHints().size() > 0) {
print(" ");
for (SQLCommentHint hint : hints) {
hint.accept(this);
}
printAndAccept(x.getHints(), " ");
}
return false;
}