improved sql parser.

This commit is contained in:
wenshao
2017-05-28 17:39:53 +08:00
parent 78488b0b1a
commit a29eb6e0d2
45 changed files with 2303 additions and 89 deletions
@@ -395,9 +395,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
if (lexer.token() == Token.TRIGGER) {
if (replace) {
lexer.reset(markBp, markChar, Token.CREATE);
}
lexer.reset(markBp, markChar, Token.CREATE);
return parseCreateTrigger();
}
// parse create procedure
@@ -3011,18 +3009,24 @@ public class MySqlStatementParser extends SQLStatementParser {
item.addColumn(name);
while (lexer.token() == Token.COMMA) {
lexer.mark();
char markChar = lexer.current();
int markBp = lexer.bp();
lexer.nextToken();
if (identifierEquals("CHANGE")) {
lexer.reset();
lexer.reset(markBp, markChar, Token.COMMA);
break;
}
if (lexer.token() == Token.IDENTIFIER) {
if ("ADD".equalsIgnoreCase(lexer.stringVal())) {
lexer.reset(markBp, markChar, Token.COMMA);
break;
}
name = exprParser.name();
name.setParent(item);
} else {
lexer.reset();
lexer.reset(markBp, markChar, Token.COMMA);
break;
}
}
@@ -3561,6 +3565,7 @@ public class MySqlStatementParser extends SQLStatementParser {
accept(Token.END);
accept(Token.IF);
accept(Token.SEMI);
stmt.setAfterSemi(true);
return stmt;
}
@@ -3770,6 +3775,7 @@ public class MySqlStatementParser extends SQLStatementParser {
accept(Token.END);
accept(Token.LOOP);
accept(Token.SEMI);
loopStmt.setAfterSemi(true);
return loopStmt;
}
@@ -3787,6 +3793,7 @@ public class MySqlStatementParser extends SQLStatementParser {
acceptIdentifier(label);
}
accept(Token.SEMI);
loopStmt.setAfterSemi(true);
return loopStmt;
}
@@ -15,14 +15,7 @@
*/
package com.alibaba.druid.sql.dialect.mysql.visitor;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLOrderBy;
import com.alibaba.druid.sql.ast.SQLParameter;
import com.alibaba.druid.sql.ast.SQLSetQuantifier;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.*;
import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -380,12 +373,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
}
public boolean visit(SQLDataType x) {
print0(x.getName());
if (!x.getArguments().isEmpty()) {
print('(');
printAndAccept(x.getArguments(), ", ");
print(')');
}
printDataType(x);
if (Boolean.TRUE == x.getAttribute("UNSIGNED")) {
print0(ucase ? " UNSIGNED" : " unsigned");
@@ -3284,6 +3272,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
@Override
public boolean visit(SQLIfStatement.Else x) {
print0(ucase ? "ELSE " : "else ");
incrementIndent();
println();
for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
SQLStatement item = x.getStatements().get(i);
@@ -3293,6 +3282,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
println();
}
}
decrementIndent();
println();
return false;
}
@@ -3617,4 +3607,24 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
public void endVisit(MySqlDeclareConditionStatement x) {
}
@Override
public boolean visit(SQLAlterTableDropColumnItem x) {
for (int i = 0; i < x.getColumns().size(); ++i) {
if (i != 0) {
print0(", ");
}
SQLName columnn = x.getColumns().get(i);
print0(ucase ? "DROP COLUMN " : "drop column ");
columnn.accept(this);
if (x.isCascade()) {
print0(ucase ? " CASCADE" : " cascade");
}
}
return false;
}
} //