improved sql parser.

This commit is contained in:
wenshao
2017-05-23 23:49:12 +08:00
parent 465b7b34b9
commit 78488b0b1a
155 changed files with 587 additions and 465 deletions
@@ -524,17 +524,19 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
println();
printlnAndAccept(x.getItems(), " ");
if (x.getElseStatements() != null) {
if (x.getElseStatements().size() > 0) {
println();
print0(ucase ? "ELSE " : "else ");
printlnAndAccept(x.getElseStatements(), ";");
print(';');
printlnAndAccept(x.getElseStatements(), "");
}
decrementIndent();
println();
print0(ucase ? "END CASE" : "end case");
if (JdbcConstants.ORACLE.equals(dbType)) {
print(';');
}
return false;
}
@@ -2207,8 +2209,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
@Override
public boolean visit(SQLSavePointStatement x) {
print0(ucase ? "SAVEPOINT " : "savepoint ");
x.getName().accept(this);
print0(ucase ? "SAVEPOINT" : "savepoint");
if (x.getName() != null) {
print(' ');
x.getName().accept(this);
}
return false;
}
@@ -3393,10 +3398,6 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
item.setParent(x);
item.accept(this);
if (JdbcConstants.ORACLE.equals(dbType)) {
print(";");
}
if (i != size - 1) {
println();
}
@@ -4241,4 +4242,24 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
this.printAndAccept(x.getItems(), ", ");
return false;
}
@Override
public boolean visit(SQLReturnStatement x) {
print0(ucase ? "RETURN" : "return");
if (x.getExpr() != null) {
print(' ');
x.getExpr().accept(this);
}
return false;
}
public void postVisit(SQLObject x) {
if (x instanceof SQLStatement) {
SQLStatement stmt = (SQLStatement) x;
if (stmt.isAfterSemi()) {
print(';');
}
}
}
}
@@ -713,4 +713,8 @@ public interface SQLASTVisitor {
boolean visit(SQLDeclareStatement x);
void endVisit(SQLDeclareStatement x);
boolean visit(SQLReturnStatement x);
void endVisit(SQLReturnStatement x);
}
@@ -558,7 +558,7 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
@Override
public boolean visit(SQLSavePointStatement x) {
return true;
return false;
}
@Override
@@ -1621,4 +1621,14 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
public void endVisit(SQLDeclareStatement x) {
}
@Override
public boolean visit(SQLReturnStatement x) {
return true;
}
@Override
public void endVisit(SQLReturnStatement x) {
}
}