diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java deleted file mode 100644 index f067351052..0000000000 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTableCollectionExpr.java +++ /dev/null @@ -1,68 +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 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 OracleTableCollectionExpr extends SQLExprImpl implements OracleExpr { - - private static final long serialVersionUID = 1L; - private SQLExpr expr; - private boolean outer = false; - - public OracleTableCollectionExpr(){ - - } - - public boolean isOuter() { - return this.outer; - } - - public void setOuter(boolean outer) { - this.outer = outer; - } - - public SQLExpr getExpr() { - return this.expr; - } - - public void setExpr(SQLExpr expr) { - this.expr = expr; - } - - public void output(StringBuffer buf) { - buf.append("TALBE ("); - this.expr.output(buf); - buf.append(")"); - if (this.outer) buf.append("(+)"); - } - - @Override - protected void accept0(SQLASTVisitor visitor) { - this.accept0((OracleASTVisitor) visitor); - } - - public void accept0(OracleASTVisitor visitor) { - if (visitor.visit(this)) { - acceptChild(visitor, this.expr); - } - - 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 58dcb10b48..cf73ea6284 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.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement; @@ -200,11 +199,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora } - @Override - public void endVisit(OracleTableCollectionExpr x) { - - } - @Override public void endVisit(OracleTableExpr x) { @@ -396,12 +390,6 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora return true; } - @Override - public boolean visit(OracleTableCollectionExpr x) { - - return true; - } - @Override public boolean visit(OracleTableExpr x) { @@ -688,7 +676,7 @@ public class OracleASTVIsitorAdapter extends SQLASTVisitorAdapter implements Ora @Override public void endVisit(OracleGroupingSetsExpr x) { - + } @Override 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 730caf63a3..960773e05c 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.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement; @@ -121,8 +120,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { void endVisit(OracleSelectUnPivot x); - void endVisit(OracleTableCollectionExpr x); - void endVisit(OracleTableExpr x); void endVisit(OracleTimestampExpr x); @@ -191,8 +188,6 @@ public interface OracleASTVisitor extends SQLASTVisitor { boolean visit(OracleSelectUnPivot x); - boolean visit(OracleTableCollectionExpr x); - boolean visit(OracleTableExpr x); boolean visit(OracleTimestampExpr 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 2b86f6677d..9ca05ab399 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.OracleTableCollectionExpr; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleConstraintState; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement; @@ -639,16 +638,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS return false; } - public boolean visit(OracleTableCollectionExpr x) { - print("TALBE ("); - x.getExpr().accept(this); - print(")"); - if (x.isOuter()) { - print("(+)"); - } - return false; - } - public boolean visit(OracleTableExpr x) { x.getTable().accept(this); @@ -893,11 +882,6 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } - @Override - public void endVisit(OracleTableCollectionExpr x) { - - } - @Override public void endVisit(OracleTableExpr x) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 6bf87eb4df..66bb4586c3 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -725,8 +725,6 @@ public class SQLExprParser extends SQLParser { } } - expr = andRest(expr); - expr = orRest(expr); return expr; }