From 6fc332768a55db88fcc5960a7b66f6481403d2f6 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 15 Oct 2011 02:24:44 +0000 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@968 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../oracle/ast/expr/OraclePriorExpr.java | 41 ------------------- .../oracle/parser/OracleExprParser.java | 4 -- .../visitor/OracleASTVIsitorAdapter.java | 22 +++------- .../oracle/visitor/OracleASTVisitor.java | 5 --- .../oracle/visitor/OracleOutputVisitor.java | 13 ------ 5 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java deleted file mode 100644 index 564709937e..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OraclePriorExpr.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.alibaba.druid.sql.dialect.oracle.ast.expr; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -public class OraclePriorExpr extends SQLExprImpl implements OracleExpr { - - private static final long serialVersionUID = 1L; - private SQLExpr expr; - - public OraclePriorExpr(){ - - } - - public OraclePriorExpr(SQLExpr expr){ - this.expr = expr; - } - - public SQLExpr getExpr() { - return expr; - } - - public void setExpr(SQLExpr expr) { - this.expr = expr; - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - accept0((OracleASTVisitor) visitor); - } - - public void accept0(OracleASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, expr); - } - visitor.endVisit(this); - } - -} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index f28faa0dfc..28c783d264 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -43,7 +43,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalType; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleOrderByItem; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelect; @@ -103,9 +102,6 @@ public class OracleExprParser extends SQLExprParser { } else { throw new ParserException("syntax error : " + lexer.token()); } - case PRIOR: - lexer.nextToken(); - primaryRest(new OraclePriorExpr(expr())); case LITERAL_ALIAS: String alias = '"' + lexer.stringVal() + '"'; lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java index 4def3204dd..5043f0dcbc 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVIsitorAdapter.java @@ -36,7 +36,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupingSetsExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; @@ -522,17 +521,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora } - @Override - public boolean visit(OraclePriorExpr x) { - - return true; - } - - @Override - public void endVisit(OraclePriorExpr x) { - - } - @Override public boolean visit(SubqueryFactoringClause x) { @@ -666,7 +654,7 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(QueryPartitionClause x) { - + } @Override @@ -676,7 +664,7 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(ModelColumn x) { - + } @Override @@ -686,7 +674,7 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(ModelRulesClause x) { - + } @Override @@ -696,7 +684,7 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(CellAssignmentItem x) { - + } @Override @@ -706,6 +694,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(CellAssignment x) { - + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java index 2b0bb4b053..730caf63a3 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleASTVisitor.java @@ -42,7 +42,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupingSetsExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; @@ -232,10 +231,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { void endVisit(GroupingSetExpr x); - boolean visit(OraclePriorExpr x); - - void endVisit(OraclePriorExpr x); - boolean visit(SubqueryFactoringClause x); void endVisit(SubqueryFactoringClause x); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 9e74180520..2b86f6677d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -67,7 +67,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupingSetsExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIsSetExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleOuterExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OraclePriorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; @@ -1035,18 +1034,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } - @Override - public boolean visit(OraclePriorExpr x) { - print("PRIOR "); - x.getExpr().accept(this); - return false; - } - - @Override - public void endVisit(OraclePriorExpr x) { - - } - @Override public boolean visit(SubqueryFactoringClause.Entry x) { x.getName().accept(this);