From 51eb2ce3fc60233fb96377367364d39ef1dc0795 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 15 Oct 2011 09:06:28 +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@978 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../ast/expr/OracleGroupingSetsExpr.java | 63 ------------------- .../visitor/OracleASTVIsitorAdapter.java | 10 --- .../oracle/visitor/OracleASTVisitor.java | 5 -- .../oracle/visitor/OracleOutputVisitor.java | 13 ---- 4 files changed, 91 deletions(-) delete mode 100644 src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java deleted file mode 100644 index 6a0167d804..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleGroupingSetsExpr.java +++ /dev/null @@ -1,63 +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.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - -public class OracleGroupingSetsExpr extends SQLExprImpl implements OracleExpr { - - private static final long serialVersionUID = 1L; - private final List items = new ArrayList(); - - public OracleGroupingSetsExpr(){ - - } - - public List getItems() { - return this.items; - } - - public void output(StringBuffer buf) { - buf.append("GROUPING SETS ("); - int i = 0; - for (int size = this.items.size(); i < size; ++i) { - if (i != 0) { - buf.append(", "); - } - ((SQLExpr) this.items.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.items); - } - - visitor.endVisit(this); - } -} 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 111c9792c0..67aaa13fa1 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 @@ -31,7 +31,6 @@ 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.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; @@ -662,13 +661,4 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora } - @Override - public void endVisit(OracleGroupingSetsExpr x) { - - } - - @Override - public boolean visit(OracleGroupingSetsExpr x) { - return true; - } } 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 1cb5bdf66c..1a271ca543 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 @@ -37,7 +37,6 @@ 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.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; @@ -85,8 +84,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { void endVisit(OracleGroupComparisonCondition x); - void endVisit(OracleGroupingSetsExpr x); - void endVisit(OracleHint x); void endVisit(OracleIntervalExpr x); @@ -151,8 +148,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { boolean visit(OracleGroupComparisonCondition x); - boolean visit(OracleGroupingSetsExpr x); - boolean visit(OracleHint x); boolean visit(OracleIntervalExpr 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 d748ef2819..c4bbeba11c 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 @@ -62,7 +62,6 @@ 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.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; @@ -235,13 +234,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS return false; } - public boolean visit(OracleGroupingSetsExpr x) { - print("GROUPING SETS ("); - printAndAccept(x.getItems(), ", "); - print(")"); - return false; - } - public boolean visit(OracleHint x) { print(x.getName()); return false; @@ -787,11 +779,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } - @Override - public void endVisit(OracleGroupingSetsExpr x) { - - } - @Override public void endVisit(OracleHint x) {