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 oracle sql parser. issue #1400

Browse Source
This commit is contained in:
wenshao
2016-09-11 23:24:49 +08:00
parent d069606a9e
commit d66fcf737e
5 changed files with 123 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java
+17 -1
View File
@@ -54,7 +54,23 @@ public class SQLDeleteStatement extends SQLStatementImpl {
}
public SQLName getTableName() {
return (SQLName) getExprTableSource().getExpr();
if (this.tableSource instanceof SQLExprTableSource) {
SQLExprTableSource exprTableSource = (SQLExprTableSource) this.tableSource;
return (SQLName) exprTableSource.getExpr();
}
if (tableSource instanceof SQLSubqueryTableSource) {
SQLSelectQuery selectQuery = ((SQLSubqueryTableSource) tableSource).getSelect().getQuery();
if (selectQuery instanceof SQLSelectQueryBlock) {
SQLTableSource subQueryTableSource = ((SQLSelectQueryBlock) selectQuery).getFrom();
if (subQueryTableSource instanceof SQLExprTableSource) {
SQLExpr subQueryTableSourceExpr = ((SQLExprTableSource) subQueryTableSource).getExpr();
return (SQLName) subQueryTableSourceExpr;
}
}
}
return null;
}
public void setTableName(SQLName tableName) {
src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java
+4 -24
View File
@@ -29,30 +29,7 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLBlockStatement;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateProcedureStatement;
import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
import com.alibaba.druid.sql.ast.statement.SQLIfStatement;
import com.alibaba.druid.sql.ast.statement.SQLInsertInto;
import com.alibaba.druid.sql.ast.statement.SQLLoopStatement;
import com.alibaba.druid.sql.ast.statement.SQLRollbackStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleReturningClause;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterIndexStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterProcedureStatement;
@@ -1283,6 +1260,9 @@ public class OracleStatementParser extends SQLStatementParser {
deleteStatement.setTableName(tableName);
accept(Token.RPAREN);
} else if (lexer.token() == Token.LPAREN) {
SQLTableSource tableSource = this.createSQLSelectParser().parseTableSource();
deleteStatement.setTableSource(tableSource);
} else {
SQLName tableName = exprParser.name();
deleteStatement.setTableName(tableName);
src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java
+18 -33
View File
@@ -28,24 +28,8 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLBlockStatement;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateProcedureStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
import com.alibaba.druid.sql.ast.statement.SQLIfStatement;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
import com.alibaba.druid.sql.ast.statement.SQLRollbackStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement;
import com.alibaba.druid.sql.ast.statement.SQLUnique;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalDay;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeIntervalYear;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleDataTypeTimestamp;
@@ -264,26 +248,27 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
}
public boolean visit(OracleDeleteStatement x) {
if (x.getTableName() != null) {
print0(ucase ? "DELETE " : "delete ");
if (x.getHints().size() > 0) {
printAndAccept(x.getHints(), ", ");
print(' ');
}
print0(ucase ? "DELETE " : "delete ");
print0(ucase ? "FROM " : "from ");
if (x.isOnly()) {
print0(ucase ? "ONLY (" : "only (");
x.getTableName().accept(this);
print(')');
} else {
x.getTableName().accept(this);
}
SQLTableSource tableSource = x.getTableSource();
printAlias(x.getAlias());
if (x.getHints().size() > 0) {
printAndAccept(x.getHints(), ", ");
print(' ');
}
print0(ucase ? "FROM " : "from ");
if (x.isOnly()) {
print0(ucase ? "ONLY (" : "only (");
x.getTableName().accept(this);
print(')');
} else {
x.getTableSource().accept(this);
}
printAlias(x.getAlias());
if (x.getWhere() != null) {
println();
incrementIndent();
src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
+8
View File
@@ -1232,6 +1232,14 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
putAliasMap(this.aliasMap, x.getAlias(), tableName);
}
if (x.getTableSource() instanceof SQLSubqueryTableSource) {
SQLSelectQuery selectQuery = ((SQLSubqueryTableSource) x.getTableSource()).getSelect().getQuery();
if (selectQuery instanceof SQLSelectQueryBlock) {
SQLSelectQueryBlock subQueryBlock = ((SQLSelectQueryBlock) selectQuery);
subQueryBlock.getWhere().accept(this);
}
}
TableStat stat = getTableStat(tableName);
stat.incrementDeleteCount();