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

improved sql parser.

Browse Source
This commit is contained in:
wenshao
2018-04-24 13:47:12 +08:00
parent 236226991b
commit c8d8409d30
9 changed files with 99 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement
if (visitor instanceof MySqlASTVisitor) {
accept0((MySqlASTVisitor) visitor);
} else {
throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
super.accept0(visitor);
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class MySqlDeleteStatement extends SQLDeleteStatement {
if (visitor instanceof MySqlASTVisitor) {
accept0((MySqlASTVisitor) visitor);
} else {
throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
super.accept0(visitor);
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlInsertStatement.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class MySqlInsertStatement extends SQLInsertStatement {
if (visitor instanceof MySqlASTVisitor) {
accept0((MySqlASTVisitor) visitor);
} else {
throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
super.accept0(visitor);
}
}
src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class MySqlUpdateStatement extends SQLUpdateStatement implements MySqlSta
if (visitor instanceof MySqlASTVisitor) {
accept0((MySqlASTVisitor) visitor);
} else {
throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
super.accept0(visitor);
}
}
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java
+47 -8
View File
@@ -799,8 +799,10 @@ public class OracleExprParser extends SQLExprParser {
}
}
over.setOrderBy(parseOrderBy());
if (over.getOrderBy() != null) {
final SQLOrderBy orderBy = parseOrderBy();
if (orderBy != null) {
over.setOrderBy(orderBy);
OracleAnalyticWindowing windowing = null;
if (lexer.identifierEquals(FnvHash.Constants.ROWS)) {
lexer.nextToken();
@@ -815,12 +817,9 @@ public class OracleExprParser extends SQLExprParser {
if (windowing != null) {
if (lexer.identifierEquals(FnvHash.Constants.CURRENT)) {
lexer.nextToken();
if (lexer.stringVal().equalsIgnoreCase("ROW")) {
lexer.nextToken();
windowing.setExpr(new SQLIdentifierExpr("CURRENT ROW"));
over.setWindowing(windowing);
}
throw new ParserException("syntax error. " + lexer.info());
accept(Token.ROW);
windowing.setExpr(new SQLIdentifierExpr("CURRENT ROW"));
over.setWindowing(windowing);
}
if (lexer.identifierEquals(FnvHash.Constants.UNBOUNDED)) {
lexer.nextToken();
@@ -830,6 +829,46 @@ public class OracleExprParser extends SQLExprParser {
} else {
throw new ParserException("syntax error. " + lexer.info());
}
} else if (lexer.token() == Token.BETWEEN) {
lexer.nextToken();
SQLExpr beginExpr;
if (lexer.identifierEquals(FnvHash.Constants.CURRENT)) {
lexer.nextToken();
accept(Token.ROW);
beginExpr = new SQLIdentifierExpr("CURRENT ROW");
} else if (lexer.identifierEquals(FnvHash.Constants.UNBOUNDED)) {
lexer.nextToken();
if (lexer.stringVal().equalsIgnoreCase("PRECEDING")) {
lexer.nextToken();
beginExpr = new SQLIdentifierExpr("UNBOUNDED PRECEDING");
} else {
throw new ParserException("syntax error. " + lexer.info());
}
} else {
beginExpr = relational();
}
accept(Token.AND);
SQLExpr endExpr;
if (lexer.identifierEquals(FnvHash.Constants.CURRENT)) {
lexer.nextToken();
accept(Token.ROW);
endExpr = new SQLIdentifierExpr("CURRENT ROW");
} else if (lexer.identifierEquals(FnvHash.Constants.UNBOUNDED)) {
lexer.nextToken();
if (lexer.stringVal().equalsIgnoreCase("PRECEDING")) {
lexer.nextToken();
endExpr = new SQLIdentifierExpr("UNBOUNDED PRECEDING");
} else {
throw new ParserException("syntax error. " + lexer.info());
}
} else {
endExpr = relational();
}
SQLExpr expr = new SQLBetweenExpr(null, beginExpr, endExpr);
windowing.setExpr(expr);
} else {
SQLExpr expr = this.expr();
windowing.setExpr(expr);
src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerRollbackStatement.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class SQLServerRollbackStatement extends SQLRollbackStatement implements
if (visitor instanceof SQLServerASTVisitor) {
accept0((SQLServerASTVisitor) visitor);
} else {
throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
super.accept0(visitor);
}
}
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+8 -6
View File
@@ -480,12 +480,14 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
quote = true;
}
if (quote) {
print('(');
printExpr(testExpr);
print(')');
} else {
printExpr(testExpr);
if (testExpr != null) {
if (quote) {
print('(');
printExpr(testExpr);
print(')');
} else {
printExpr(testExpr);
}
}
if (x.isNot()) {
src/test/java/com/alibaba/druid/sql/refactor/AddWhere_0.java → src/test/java/com/alibaba/druid/bvt/sql/refactor/AddWhere_0.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.alibaba.druid.sql.refactor;
package com.alibaba.druid.bvt.sql.refactor;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
src/test/java/com/alibaba/druid/bvt/sql/refactor/ClearSchema_0.java
+38
View File
@@ -0,0 +1,38 @@
package com.alibaba.druid.bvt.sql.refactor;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLCaseExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter;
import com.alibaba.druid.util.JdbcConstants;
import junit.framework.TestCase;
import java.util.List;
public class ClearSchema_0 extends TestCase {
public void test_insert_0() throws Exception {
String sql = "INSERT INTO testdb.Websites (name, country)\n" +
"SELECT app_name, country FROM testdb.apps;";
SQLStatement stmt = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL).get(0);
SQLASTVisitor v = new SQLASTVisitorAdapter() {
@Override
public boolean visit(SQLPropertyExpr x) {
if (SQLUtils.replaceInParent(x, new SQLIdentifierExpr(x.getName()))) {
return false;
}
return super.visit(x);
}
};
stmt.accept(v);
assertEquals("INSERT INTO Websites (name, country)\n" +
"SELECT app_name, country\n" +
"FROM apps;", stmt.toString());
}
}