improved mysql parser.

This commit is contained in:
wenshao
2017-11-03 14:31:16 +08:00
parent 070cc5762d
commit d94b773de9
10 changed files with 509 additions and 290 deletions
@@ -1004,7 +1004,16 @@ public class MySqlStatementParser extends SQLStatementParser {
block.setDbType(dbType);
accept(Token.BEGIN);
this.parseStatementList(block.getStatementList(), -1, block);
List<SQLStatement> statementList = block.getStatementList();
this.parseStatementList(statementList, -1, block);
if (lexer.token() != Token.END
&& statementList.size() > 0
&& (statementList.get(statementList.size() - 1) instanceof SQLCommitStatement
|| statementList.get(statementList.size() - 1) instanceof SQLRollbackStatement)) {
block.setEndOfCommit(true);
return block;
}
accept(Token.END);
return block;
@@ -2977,8 +2977,13 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
this.indentCount--;
println();
}
print0(ucase ? "BEGIN" : "begin");
this.indentCount++;
if (!x.isEndOfCommit()) {
this.indentCount++;
} else {
print(';');
}
println();
List<SQLStatement> statementList = x.getStatementList();
for (int i = 0, size = statementList.size(); i < size; ++i) {
@@ -2988,13 +2993,17 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
SQLStatement stmt = statementList.get(i);
stmt.accept(this);
}
this.indentCount--;
println();
print0(ucase ? "END" : "end");
if (labelName != null && !labelName.equals("")) {
print(' ');
print0(labelName);
if (!x.isEndOfCommit()) {
this.indentCount--;
println();
print0(ucase ? "END" : "end");
if (labelName != null && !labelName.equals("")) {
print(' ');
print0(labelName);
}
}
return false;
}