Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improve sqlwall

Browse Source
This commit is contained in:
Yako
2014-09-09 20:04:50 +08:00
parent e6eddc52cd
commit 663a1c37ff
7 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateDatabaseStatement.java
+16 -3
View File
@@ -15,16 +15,21 @@
*/
package com.alibaba.druid.sql.ast.statement;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLCreateDatabaseStatement extends SQLStatementImpl {
private SQLName name;
private SQLName name;
private String characterSet;
private String collate;
private String characterSet;
private String collate;
private List<SQLCommentHint> hints;
public SQLCreateDatabaseStatement(){
}
@@ -61,4 +66,12 @@ public class SQLCreateDatabaseStatement extends SQLStatementImpl {
this.collate = collate;
}
public List<SQLCommentHint> getHints() {
return hints;
}
public void setHints(List<SQLCommentHint> hints) {
this.hints = hints;
}
}
src/main/java/com/alibaba/druid/sql/ast/statement/SQLExplainStatement.java
+14 -1
View File
@@ -15,13 +15,18 @@
*/
package com.alibaba.druid.sql.ast.statement;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLExplainStatement extends SQLStatementImpl {
protected SQLStatement statement;
protected SQLStatement statement;
private List<SQLCommentHint> hints;
public SQLStatement getStatement() {
return statement;
@@ -41,4 +46,12 @@ public class SQLExplainStatement extends SQLStatementImpl {
}
visitor.endVisit(this);
}
public List<SQLCommentHint> getHints() {
return hints;
}
public void setHints(List<SQLCommentHint> hints) {
this.hints = hints;
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+4
View File
@@ -2537,6 +2537,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;
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java
+6 -15
View File
@@ -1123,12 +1123,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()) {
@@ -2143,12 +2140,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;
@@ -2685,12 +2679,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;
}
src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java
+6 -1
View File
@@ -1534,8 +1534,13 @@ public class SQLStatementParser extends SQLParser {
if (lexer.token() == Token.FOR) {
lexer.nextToken();
}
SQLExplainStatement explain = new SQLExplainStatement();
if(lexer.token == Token.HINT) {
explain.setHints(this.exprParser.parseHints());
}
explain.setStatement(parseStatement());
return explain;
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+7 -5
View File
@@ -1149,13 +1149,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
print("SET ");
printAndAccept(x.getItems(), ", ");
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;
}
@@ -1770,6 +1768,10 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
@Override
public boolean visit(SQLExplainStatement x) {
print("EXPLAIN");
if (x.getHints() != null && x.getHints().size() > 0) {
print(" ");
printAndAccept(x.getHints(), " ");
}
println();
x.getStatement().accept(this);
return false;