From 53ce58b6c2f08fac31ad8954656566b98979b4da Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 15 Oct 2011 09:08:10 +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@979 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../expr/OracleGroupComparisonCondition.java | 111 ------------------ .../visitor/OracleASTVIsitorAdapter.java | 12 -- .../oracle/visitor/OracleASTVisitor.java | 21 ++-- .../oracle/visitor/OracleOutputVisitor.java | 29 ----- 4 files changed, 8 insertions(+), 165 deletions(-) delete mode 100644 src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java deleted file mode 100644 index 2bc037492a..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupComparisonCondition.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.sql.dialect.oracle.ast.expr; - -import java.util.ArrayList; -import java.util.List; - -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLExprImpl; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -public class OracleGroupComparisonCondition extends SQLExprImpl implements OracleExpr { - - private static final long serialVersionUID = 1L; - private final List exprList = new ArrayList(); - private SQLBinaryOperator operator; - private OracleGroupComparator comparator; - private final List targetExprList = new ArrayList(); - - public OracleGroupComparisonCondition(){ - - } - - public List getTargetExprList() { - return this.targetExprList; - } - - public SQLBinaryOperator getOperator() { - return this.operator; - } - - public void setOperator(SQLBinaryOperator operator) { - this.operator = operator; - } - - public OracleGroupComparator getComparator() { - return this.comparator; - } - - public void setComparator(OracleGroupComparator comparator) { - this.comparator = comparator; - } - - public List getExprList() { - return this.exprList; - } - - public void output(StringBuffer buf) { - if (this.exprList.size() > 1) { - buf.append("("); - } - for (int i = 0, size = this.exprList.size(); i < size; ++i) { - if (i != 0) { - buf.append(", "); - } - ((SQLExpr) this.exprList.get(i)).output(buf); - } - if (this.exprList.size() > 1) { - buf.append(")"); - } - - buf.append(" "); - buf.append(this.operator.name); - buf.append(" "); - buf.append(this.comparator.name()); - - buf.append(" "); - - buf.append("("); - for (int i = 0, size = this.targetExprList.size(); i < size; ++i) { - if (i != 0) { - buf.append(", "); - } - ((SQLExpr) this.targetExprList.get(i)).output(buf); - } - buf.append(")"); - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - this.accept0((OracleASTVisitor) visitor); - } - - public void accept0(OracleASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, this.exprList); - acceptChild(visitor, this.targetExprList); - } - - visitor.endVisit(this); - } - - public static enum OracleGroupComparator { - ALL, ANY, SOME; - } -} 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 67aaa13fa1..58455f8fab 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 @@ -30,7 +30,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupComparisonCondition; 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; @@ -112,11 +111,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora } - @Override - public void endVisit(OracleGroupComparisonCondition x) { - - } - @Override public void endVisit(OracleHint x) { @@ -281,12 +275,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora return true; } - @Override - public boolean visit(OracleGroupComparisonCondition x) { - - return true; - } - @Override public boolean visit(OracleHint 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 1a271ca543..934644fa80 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 @@ -36,7 +36,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupComparisonCondition; 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; @@ -82,8 +81,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { void endVisit(OracleExtractExpr x); - void endVisit(OracleGroupComparisonCondition x); - void endVisit(OracleHint x); void endVisit(OracleIntervalExpr x); @@ -146,8 +143,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { boolean visit(OracleExtractExpr x); - boolean visit(OracleGroupComparisonCondition x); - boolean visit(OracleHint x); boolean visit(OracleIntervalExpr x); @@ -267,21 +262,21 @@ public interface OracleASTVisitor extends SQLASTVisitor { boolean visit(ModelClause.QueryPartitionClause x); void endVisit(ModelClause.QueryPartitionClause x); - + boolean visit(ModelClause.ModelColumn x); - + void endVisit(ModelClause.ModelColumn x); - + boolean visit(ModelClause.ModelRulesClause x); - + void endVisit(ModelClause.ModelRulesClause x); - + boolean visit(ModelClause.CellAssignmentItem x); - + void endVisit(ModelClause.CellAssignmentItem x); - + boolean visit(ModelClause.CellAssignment x); - + void endVisit(ModelClause.CellAssignment x); boolean visit(ModelClause 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 c4bbeba11c..b42c29cee6 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 @@ -61,7 +61,6 @@ import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDateExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleDbLinkExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExtractExpr; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleGroupComparisonCondition; 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; @@ -211,29 +210,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS return false; } - public boolean visit(OracleGroupComparisonCondition x) { - if (x.getExprList().size() > 1) { - print("("); - } - printAndAccept(x.getExprList(), ", "); - if (x.getExprList().size() > 1) { - print(")"); - } - - print(" "); - print(x.getOperator().name); - print(" "); - print(x.getComparator().name()); - - print(" "); - - print("("); - printAndAccept(x.getTargetExprList(), ", "); - print(")"); - - return false; - } - public boolean visit(OracleHint x) { print(x.getName()); return false; @@ -774,11 +750,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } - @Override - public void endVisit(OracleGroupComparisonCondition x) { - - } - @Override public void endVisit(OracleHint x) {